spec/isodoc/metadata_spec.rb in isodoc-0.9.14 vs spec/isodoc/metadata_spec.rb in isodoc-0.9.15

- old
+ new

@@ -10,15 +10,15 @@ expect(Hash[c.info(Nokogiri::XML(<<~"INPUT"), nil).sort]).to be_equivalent_to <<~"OUTPUT" <iso-standard xmlns="http://riboseinc.com/isoxml"> <bibdata type="international-standard"> <title>The Incredible Mr Ripley</title> <title language="en">Cereals and pulses</title> - <source>URL A</source> - <source type="html">URL B</source> - <source type="xml">URL C</source> - <source type="pdf">URL D</source> - <source type="doc">URL E</source> + <uri>URL A</uri> + <uri type="html">URL B</uri> + <uri type="xml">URL C</uri> + <uri type="pdf">URL D</uri> + <uri type="doc">URL E</uri> <docidentifier>17301-1</docidentifier> <docnumber>17301</docnumber> <date type="published"><on>2011</on></date> <date type="accessed"><on>2012</on></date> <date type="created"><from>2010</from><to>2011</to></date> @@ -34,10 +34,30 @@ <role type="publisher"/> <organization> <abbreviation>ISO</abbreviation> </organization> </contributor> + <contributor> + <role type="editor"/> + <person> + <name> + <forename>Barney</forename> + <surname>Rubble</surname> + </name> + <affiliation> + <org><name>Bedrock Inc.</name></org> + </affiliation> + </person> + </contributor> + <contributor> + <role type="author"/> + <person> + <name> + <completename>Fred Flintstone</completename> + </name> + </person> + </contributor> <language>en</language> <script>Latn</script> <status>Committee Draft</status> <copyright> <from>2016</from> @@ -58,11 +78,11 @@ <revision-date>2016-05-01</revision-date> <draft>0.4</draft> </version> </iso-standard> INPUT -{:accesseddate=>"2012", :activateddate=>"2013", :agency=>"ISO", :confirmeddate=>"XXX", :createddate=>"2010&ndash;2011", :doc=>"URL E", :docnumber=>"17301-1", :doctitle=>"Cereals and pulses", :doctype=>"International Standard", :docyear=>"2016", :draft=>"0.4", :draftinfo=>" (draft 0.4, 2016-05-01)", :editorialgroup=>["TC 34", "SC 4", "WG 3"], :html=>"URL B", :ics=>"XXX", :implementeddate=>"XXX", :issueddate=>"XXX", :obsoleteddate=>"2014", :obsoletes=>nil, :obsoletes_part=>nil, :pdf=>"URL D", :publisheddate=>"2011", :receiveddate=>"XXX", :revdate=>"2016-05-01", :sc=>"SC 4", :secretariat=>"GB", :status=>"Committee draft", :tc=>"TC 34", :unpublished=>false, :updateddate=>"XXX", :url=>"URL A", :wg=>"WG 3", :xml=>"URL C"} +{:accesseddate=>"2012", :activateddate=>"2013", :agency=>"ISO", :authors=>["Barney Rubble", "Fred Flintstone"], :authors_affiliations=>{"Bedrock Inc."=>["Barney Rubble"], ""=>["Fred Flintstone"]}, :confirmeddate=>"XXX", :createddate=>"2010&ndash;2011", :doc=>"URL E", :docnumber=>"17301-1", :doctitle=>"Cereals and pulses", :doctype=>"International Standard", :docyear=>"2016", :draft=>"0.4", :draftinfo=>" (draft 0.4, 2016-05-01)", :editorialgroup=>["TC 34", "SC 4", "WG 3"], :html=>"URL B", :ics=>"XXX", :implementeddate=>"XXX", :issueddate=>"XXX", :obsoleteddate=>"2014", :obsoletes=>nil, :obsoletes_part=>nil, :pdf=>"URL D", :publisheddate=>"2011", :receiveddate=>"XXX", :revdate=>"2016-05-01", :sc=>"SC 4", :secretariat=>"GB", :status=>"Committee draft", :tc=>"TC 34", :unpublished=>true, :updateddate=>"XXX", :url=>"URL A", :wg=>"WG 3", :xml=>"URL C"} OUTPUT end it "processes IsoXML metadata" do c = IsoDoc::Convert.new({}) @@ -121,10 +141,10 @@ <revision-date>2016-05-01</revision-date> <draft>12</draft> </version> </iso-standard> INPUT -{:accesseddate=>"XXX", :agency=>"ISO/IEC", :confirmeddate=>"XXX", :createddate=>"XXX", :docnumber=>"17301-1-3", :doctitle=>"Cereals and pulses", :doctype=>"International Standard", :docyear=>"2016", :draft=>"12", :draftinfo=>" (draft 12, 2016-05-01)", :editorialgroup=>["ABC 34", "DEF 4", "GHI 3"], :ics=>"1.2.3, 1.2.3", :implementeddate=>"XXX", :issueddate=>"XXX", :obsoleteddate=>"XXX", :obsoletes=>"IEC 8121", :obsoletes_part=>"3.1", :publisheddate=>"XXX", :receiveddate=>"XXX", :revdate=>"2016-05-01", :sc=>"DEF 4", :secretariat=>"XXXX", :status=>"Published", :tc=>"ABC 34", :unpublished=>true, :updateddate=>"XXX", :wg=>"GHI 3"} +{:accesseddate=>"XXX", :agency=>"ISO/IEC", :authors=>[], :authors_affiliations=>{}, :confirmeddate=>"XXX", :createddate=>"XXX", :docnumber=>"17301-1-3", :doctitle=>"Cereals and pulses", :doctype=>"International Standard", :docyear=>"2016", :draft=>"12", :draftinfo=>" (draft 12, 2016-05-01)", :editorialgroup=>["ABC 34", "DEF 4", "GHI 3"], :ics=>"1.2.3, 1.2.3", :implementeddate=>"XXX", :issueddate=>"XXX", :obsoleteddate=>"XXX", :obsoletes=>"IEC 8121", :obsoletes_part=>"3.1", :publisheddate=>"XXX", :receiveddate=>"XXX", :revdate=>"2016-05-01", :sc=>"DEF 4", :secretariat=>"XXXX", :status=>"Published", :tc=>"ABC 34", :unpublished=>false, :updateddate=>"XXX", :wg=>"GHI 3"} OUTPUT end end