adiwg-mdtranslator 2.0.0rc3 → 2.0.0rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b34a86163000468f677f4bf2b9ec4d99ac7a3b7
-  data.tar.gz: ab59fc169dd40eae67f85cdc18435da669c213ad
+  metadata.gz: 9ac02a8bc57a59eda7e2f4c0a2580d05ba8954c1
+  data.tar.gz: 27b65f59348f2b77f436897178310970dbd166aa
 SHA512:
-  metadata.gz: 2544e744a8a65c009ffd123072828077757d49cc96d711e03ed5279a1d5e014396578f6df74d13e1cdaf5051f17edf66aec3f87279f6e2a599f35e1b714198b2
-  data.tar.gz: c8d2661db5830556659a2c938618d763a8e44a90facbbc1ce2c810b5801c723d321a4039faade0dd7a0bb104e05f968f85b289a08f0bdec3441b8e7f94c59792
+  metadata.gz: 2b49937387fec483647adf0e79d151558839e1642ae48606e2dc8bb7f1dc2d7c8984bcbe8e62b6c731ab448a645fd764ed3095d01f9d768502f027eb31e1a9e4
+  data.tar.gz: ed6261e0c4aa8c81854ca9754f3cdfe794d15f5342070b8ebaf01a557a8a541d0cf59e64b02c667fd88b675329103781f80b2392ca7611b22d72907a4373f3bc

data/Rakefile

@@ -9,6 +9,7 @@ Rake::TestTask.new do |t|
 		'test/writers/iso19110/tc*.rb',
 		'test/writers/mdJson/tc*.rb',
 		'test/writers/sbJson/tc*.rb',
+		'test/writers/html/tc*.rb',
 		'test/translator/tc*.rb'
 	]
 	t.verbose = true

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.1"
+   spec.add_runtime_dependency "adiwg-mdjson_schemas", ">= 2.1.2"
    spec.add_runtime_dependency "adiwg-mdcodes", "~> 2.1"
    spec.add_runtime_dependency "jbuilder", "~> 2.5"
 

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

@@ -7,7 +7,16 @@
 
 ### Reader for ADIwg JSON metadata format (mdJson)
 
-The mdJson format is a simple JSON format for documenting and exchanging information about scientific projects and data.  The Alaska Data Integration working group (ADIwg) wrote the standard to support translation to complex standards such as the ISO 19115-2 Geographic Metadata standard and FGDC's Content Standard for Digital Geospatial Metadata.  The mdJson standard remains independent of any published standards while comprehensive enough to support translation to established standards. The mdJson record is also a convenient format to exchange directly with other organizations as the JSON structure is easily created and ingest by programming languages.
+The mdJson format is a simple JSON format for documenting and 
+exchanging information about scientific projects and data.  
+The Alaska Data Integration working group (ADIwg) wrote the standard 
+to support translation to complex standards such as the ISO 19115-2 
+Geographic Metadata standard and FGDC's Content Standard for Digital 
+Geospatial Metadata.  The mdJson standard remains independent of any 
+published standards while comprehensive enough to support translation 
+to established standards. The mdJson record is also a convenient format 
+to exchange directly with other organizations as the JSON structure 
+is easily created and ingest by programming languages.
 
 The mdJson format is fully documented on the interactive
 [mdTools](http://mdTools.adiwg.org) website.

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

@@ -1,14 +1,15 @@
 # adiwg mdTranslator / readers / mdJson
 
 # version 2 history
-# 2016-10-01 start of version 2
+# 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.0.0"
-            end
-        end
-    end
+   module Mdtranslator
+      module Readers
+         module MdJson
+            VERSION = "2.1.2"
+         end
+      end
+   end
 end

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

@@ -7,6 +7,12 @@
 
 ### Reader for ScienceBase JSON metadata format (sbJSON)
 
-The ScienceBase Item core is based on the Dublin Core Metadata Element Set but also includes other elements that may or may not be associated with other metadata standards that are useful for the core attribution of ScienceBase items. It is used as a means to 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 ScienceBase Item core is based on the Dublin Core Metadata 
+Element Set but also includes other elements that may or may not 
+be associated with other metadata standards that are useful for the 
+core attribution of ScienceBase items. It is used as a means to 
+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).

data/lib/adiwg/mdtranslator/version.rb

@@ -1,6 +1,7 @@
 # adiwg mdTranslator
 
 # version 2 history
+# 2.0.0rc4 2017-05-19 bump mdJson schema version to 2.1.2
 # 2.0.0rc3 2017-05-16 removed topicCategory from schema and manage as keyword
 # 2.0.0rc2 2017-04-21 removed inline CSS option from CLI
 # 2.0.0rc1 2017-04-09 release candidate 1
@@ -9,7 +10,7 @@
 module ADIWG
    module Mdtranslator
       # current mdtranslator version
-      VERSION = "2.0.0rc3"
+      VERSION = "2.0.0rc4"
    end
 end
 

data/lib/adiwg/mdtranslator/writers/html/readme.md

@@ -3,6 +3,13 @@
 
 ### Writer for HTML 'human-readable' output of metadata
 
-The HTML Metadata Record output from the mdTranslator is intended to be a human readable version of the metadata content read in by the translator.  The HTML output does not attempt mimic any established metadata standard but remains agnostic in its presentation.  The HTML metadata output will display the full content of the metadata record ingested by the mdTranslator while translation to established standards may not support all fields.
-
-The HTML output can be conveniently embedded in a users web page to present metadata content to visitors.
+The HTML Metadata Record output from the mdTranslator is intended to 
+be a human readable version of the metadata content read in by the 
+translator.  The HTML output does not attempt mimic any established 
+metadata standard but remains agnostic in its presentation. 
+The HTML metadata output will display the full content of the 
+metadata record ingested by the mdTranslator while translation to 
+established standards may not support all fields.
+
+The HTML output can be conveniently embedded in a users web page to 
+present metadata content to visitors.

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

@@ -94,6 +94,12 @@ module ADIWG
                      shortVersion = aShortVersion[0].to_s + '.' + aShortVersion[1].to_s
                      @html.h1('mdTranslator ' + shortVersion + ' HTML Metadata Record', 'id' => 'mdtranslator-metadata-report')
 
+                     # report date
+                     @html.section(:class => 'block') do
+                        @html.em('Report Generated:')
+                        @html.text!(Time.new.inspect)
+                     end
+
                      # metadata source
                      @html.h2('Metadata Source', 'id' => 'metadataSource')
                      @html.section(:class => 'block') do

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

@@ -2,6 +2,7 @@
 # resource information
 
 # History:
+#  Stan Smith 2017-05-19 removed iso topicCategory (now presented as keywords)
 #  Stan Smith 2017-03-25 refactored for mdTranslator 2.0
 #  Stan Smith 2015-07-16 refactored to remove global namespace $HtmlNS
 # 	Stan Smith 2015-03-24 original script
@@ -282,19 +283,9 @@ module ADIWG
                      @html.details do
                         @html.summary('Keywords', {'id' => 'resourceInfo-keyword', 'class' => 'h3'})
                         @html.section(:class => 'block') do
-
-                           # resource - topic categories []
-                           hResource[:topicCategories].each do |category|
-                              @html.em('Topic: ')
-                              @html.text!(category)
-                              @html.br
-                           end
-
-                           # resource - keywords []
                            hResource[:keywords].each do |hKeyword|
                               keywordClass.writeHtml(hKeyword)
                            end
-
                         end
                      end
                   end

data/lib/adiwg/mdtranslator/writers/iso19110/readme.md

@@ -3,6 +3,14 @@
 
 ### Writer for ISO 19110 Feature Catalogue
 
-The mdTranslator 'iso19110' writer implements about 70% of the for ISO 19110 standard. Efforts were made to include all elements of the ISO standard that describe entity-attribute descriptions for tabular data, spreadsheets, and relational databases.
+The mdTranslator 'iso19110' writer implements about 70% of the for 
+ISO 19110 standard. Efforts were made to include all elements of the 
+ISO standard that describe entity-attribute descriptions for tabular 
+data, spreadsheets, and relational databases.
 
-The ISO 19110 record can be used to provide data dictionary information for ISO 19115-2 metadata (circa 2003) and is delivered as a separate file from the ISO 19115-2 resource metadata.  This inconvenient implementation was improved in the 2014 revision ISO 19115-1 schema.  mdTranslator will provide support for ISO 19115-1 sometime in 2017.
+The ISO 19110 record can be used to provide data dictionary 
+information for ISO 19115-2 metadata (circa 2003) and is delivered 
+as a separate file from the ISO 19115-2 resource metadata.  This 
+inconvenient implementation was improved in the 2014 revision I
+SO 19115-1 schema.  mdTranslator will provide support for ISO 
+19115-1 sometime in 2017.

data/lib/adiwg/mdtranslator/writers/iso19115_2/readme.md

@@ -3,4 +3,10 @@
 
 ### Writer for ISO 19115-2:2009 Geographic Metadata
 
-The mdTranslator iso19115_2 writer implements approximately 95% of the for ISO 19115-2 standard. Efforts were made to include all elements of the ISO standard that support general data descriptions to ensure generation of health and robust project and data metadata records. The sections of 19115-2 not supported by the mdTranslator writer are the 'quantitative' section for data quality, portrayal catalog reference, and application schema information. 
+The mdTranslator iso19115_2 writer implements approximately 95% of 
+the for ISO 19115-2 standard. Efforts were made to include all 
+elements of the ISO standard that support general data descriptions 
+to ensure generation of health and robust project and data metadata 
+records. The sections of 19115-2 not supported by the mdTranslator 
+writer are the 'quantitative' section for data quality, portrayal 
+catalog reference, and application schema information. 

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

@@ -7,7 +7,17 @@
 
 ### Writer for ADIwg JSON metadata format (mdJson)
 
-The mdJson format is a simple JSON format for documenting and exchanging information about scientific projects and data.  The Alaska Data Integration working group (ADIwg) wrote the standard to support translation to complex standards such as the ISO 19115-2 Geographic Metadata standard and FGDC's Content Standard for Digital Geospatial Metadata.  The mdJson standard remains independent of any published standards while comprehensive enough to support translation to established standards. The mdJson record is also a convenient format to exchange directly with other organizations as the JSON structure is easily created and ingest by programming languages.
+The mdJson format is a simple JSON format for documenting and 
+exchanging information about scientific projects and data.  
+The Alaska Data Integration working group (ADIwg) wrote the 
+standard to support translation to complex standards such as 
+the ISO 19115-2 Geographic Metadata standard and FGDC's Content 
+Standard for Digital Geospatial Metadata.  The mdJson standard 
+remains independent of any published standards while comprehensive 
+enough to support translation to many established standards. 
+The mdJson record is also a convenient format to exchange directly 
+with other organizations as the JSON structure is easily created 
+and ingest by modern programming languages.
 
 The mdJson format is fully documented on the interactive
 [mdTools](http://mdTools.adiwg.org) website.

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

@@ -7,6 +7,13 @@
 
 ### Writer for ScienceBase JSON metadata format (sbJSON)
 
-The ScienceBase Item core is based on the Dublin Core Metadata Element Set but also includes other elements that may or may not be associated with other metadata standards that are useful for the core attribution of ScienceBase items. It is used as a means to 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 ScienceBase Item core is based on the Dublin Core Metadata 
+Element Set but also includes other elements that may or may not 
+be associated with other metadata standards that are useful for 
+the core attribution of ScienceBase items. It is used as a means 
+to 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 fully documented on 
+the [ScienceBase Confluence page](https://my.usgs.gov/confluence/display/sciencebase/ScienceBase+Information+Model).

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adiwg-mdtranslator
 version: !ruby/object:Gem::Version
-  version: 2.0.0rc3
+  version: 2.0.0rc4
 platform: ruby
 authors:
 - Stan Smith
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-17 00:00:00.000000000 Z
+date: 2017-05-21 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.1
+        version: 2.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 2.1.2
 - !ruby/object:Gem::Dependency
   name: adiwg-mdcodes
   requirement: !ruby/object:Gem::Requirement
@@ -610,7 +610,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: The mdtranslator (metadata translator) is a tool for translating metadata