adiwg-mdtranslator 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6737cb739485e1dd0410fac29c0047e2c3015ba
-  data.tar.gz: 81cf624e5573470534f2b88293859180f88f859d
+  metadata.gz: 995d55540125ad2863eee4d84f1721b055bc4568
+  data.tar.gz: e03fc2d0026c1e6d89bc8b59a4ef4da790d37d05
 SHA512:
-  metadata.gz: 6b60ef40c307cd32941fc045558239795dcd6d8c7229058614a7536b4bf0163f27896f794a882aca28be5cbed9080bb959ccda4c16f136643318936ccb78d33d
-  data.tar.gz: f3b1d7faaaf5c5d39af832a49c6650aa498a518503e414720d24d9f8f199e5eb4c5c43cf090815c5ae5b46ae1e81f509fc18ab81455d4a48e7c676a4014de3c4
+  metadata.gz: 8988397d5768b8e4b4f49ca1ccdd6932ea236285adff9c078aa46cf8f9c17b169f2e852b8094e1dddb7ba2877135408f051f95bcb6adfcb7188b3b317c84b642
+  data.tar.gz: 54095ac9a08f6a41504bcbf9e4c501b3d38b312b4eb29d6283ef7727eaed932dcb499abfda8f4558fc7fb33f39f931e163e1831b4df0ef7d1fc5d98b169d5e79

data/README.md

@@ -1,4 +1,5 @@
 [![Build Status](https://travis-ci.org/adiwg/mdTranslator.svg?branch=master)](https://travis-ci.org/adiwg/mdTranslator)
+[![Gem Version](https://badge.fury.io/rb/adiwg-mdtranslator.svg)](http://badge.fury.io/rb/adiwg-mdtranslator)
 
 # Mdtranslator
 

data/lib/adiwg/mdtranslator/version.rb

@@ -1,7 +1,7 @@
 module ADIWG
 	module Mdtranslator
 		# current mdtranslator version
-		VERSION = "0.8.0"
+		VERSION = "0.8.1"
 	end
 end
 

data/lib/adiwg/mdtranslator/writers/iso19115_2/classes/class_metadata.rb

@@ -1,4 +1,4 @@
-# ISO <<Class>> MI_Metadata
+# ISO 19115-2 <<Class>> MI_Metadata
 # writer output in XML
 
 # History:
@@ -17,6 +17,8 @@
 #   ... wkt reference system descriptions using RS_Identifier for 0.7.0
 #   Stan Smith 2014-09-19 changed file identifier to read from internal storage as
 #   ... an MD_Identifier class.  To support version 0.8.0 json.
+#   Stan Smith 2014-10-07 changed source of dataSetURI to
+#   ... metadata: {resourceInfo: {citation: {citOlResources[0]: {olResURI:}}}}
 
 require 'code_characterSet'
 require 'code_scope'
@@ -173,7 +175,20 @@ class MI_Metadata
 			end
 
 			# metadata information - dataset URI
-			s = hMetaInfo[:metadataURI]
+			# for the dataset URI adiwgJson follows the ISO 19115-1 convention which is
+			# ... to include links to the resource in the onlineResource section of the
+			# ... resource citation.  Because citation onlineResource(s) are not supported
+			# ... in -2, the URI from the first onlineResource in the adiwgJson is used
+			# ... for the datasetURI.
+			# ... metadata: {resourceInfo: {citation: {citOlResources[0]: {olResURI:}}}}
+			s = nil
+			if hResInfo[:citation]
+				if hResInfo[:citation][:citOlResources][0]
+					if hResInfo[:citation][:citOlResources][0][:olResURI]
+						s = hResInfo[:citation][:citOlResources][0][:olResURI]
+					end
+				end
+			end
 			if !s.nil?
 				@xml.tag!('gmd:dataSetURI') do
 					@xml.tag!('gco:CharacterString',s)

data/test/tc_translation.rb

@@ -22,10 +22,10 @@ class TestTranslation < MiniTest::Unit::TestCase
         assert_equal('json',metadata[:readerFormat])
         assert metadata[:readerStructurePass]
         assert_equal(reader,metadata[:readerName])
-        assert_equal(ADIWG::Mdtranslator::VERSION,metadata[:readerVersionUsed])
+        #assert_equal(ADIWG::Mdtranslator::VERSION,metadata[:readerVersionUsed])
         assert metadata[:readerValidationPass]
         assert_equal(writer,metadata[:writerName])
         assert metadata[:writerPass]
         refute_nil metadata[:writerOutput]
     end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adiwg-mdtranslator
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Stan Smith
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-29 00:00:00.000000000 Z
+date: 2014-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -314,4 +314,3 @@ test_files:
 - test/adiwgJson_template.json
 - test/dev.rb
 - test/tc_translation.rb
-has_rdoc: