bolognese 1.0.6 → 1.0.7

data/lib/bolognese/writers/datacite_json_writer.rb

@@ -9,23 +9,23 @@ module Bolognese
           "doi" => doi,
           "url" => url,
           "creator" => creator,
-          "title" => title,
+          "titles" => titles,
           "publisher" => publisher,
-          "resource-type-general" => types["resource_type_general"],
-          "resource-type" => types["resource_type"],
-          "subject" => keywords.present? ? keywords.split(", ") : nil,
+          "periodical" => periodical,
+          "types" => to_datacite_json(types, first: true),
+          "subjects" => to_datacite_json(subjects),
           "contributor" => contributor,
           "dates" => to_datacite_json(dates),
           "publication-year" => publication_year,
           "language" => language,
-          "alternate-identifiers" => alternate_identifiers,
+          "alternate-identifiers" => to_datacite_json(alternate_identifiers),
           "related-identifiers" => to_datacite_json(related_identifiers),
-          "size" => size,
+          "sizes" => sizes,
           "formats" => formats,
           "version" => version,
-          "rights" => rights,
-          "description" => description,
-          "geo-location" => geo_location,
+          "rights-list" => to_datacite_json(rights_list),
+          "descriptions" => to_datacite_json(descriptions),
+          "geo-locations" => to_datacite_json(geo_locations),
           "funding-references" => to_datacite_json(funding_references),
           "schema-version" => schema_version,
           "provider-id" => provider_id,

data/lib/bolognese/writers/jats_writer.rb

@@ -69,9 +69,9 @@ module Bolognese
 
       def insert_citation_title(xml)
         case publication_type.fetch('publication-type', nil)
-        when "data" then xml.send("data-title", parse_attributes(title, content: "text", first: true))
-        when "journal" then xml.send("article-title", parse_attributes(title, content: "text", first: true))
-        when "chapter" then xml.send("chapter-title", parse_attributes(title, content: "text", first: true))
+        when "data" then xml.send("data-title", parse_attributes(titles, content: "title", first: true))
+        when "journal" then xml.send("article-title", parse_attributes(titles, content: "title", first: true))
+        when "chapter" then xml.send("chapter-title", parse_attributes(titles, content: "title", first: true))
         end
       end
 
@@ -79,7 +79,7 @@ module Bolognese
         if is_article? || is_data? || is_chapter?
           xml.source(periodical && periodical["title"] || publisher)
         else
-          xml.source(parse_attributes(title, content: "text", first: true))
+          xml.source(parse_attributes(titles, content: "title", first: true))
         end
       end
 

data/lib/bolognese/writers/ris_writer.rb

@@ -6,13 +6,13 @@ module Bolognese
       def ris
         {
           "TY" => types["ris"],
-          "T1" => parse_attributes(title, content: "text", first: true),
+          "T1" => parse_attributes(titles, content: "title", first: true),
           "T2" => periodical && periodical["title"],
           "AU" => to_ris(creator),
           "DO" => doi,
           "UR" => url,
-          "AB" => parse_attributes(description, content: "text", first: true),
-          "KW" => Array.wrap(keywords).map { |k| parse_attributes(k, content: "text", first: true) }.presence,
+          "AB" => parse_attributes(descriptions, content: "description", first: true),
+          "KW" => Array.wrap(subjects).map { |k| parse_attributes(k, content: "subject", first: true) }.presence,
           "PY" => publication_year,
           "PB" => publisher,
           "LA" => language,
@@ -20,7 +20,7 @@ module Bolognese
           "IS" => issue,
           "SP" => first_page,
           "EP" => last_page,
-          "SN" => Array.wrap(related_identifiers).find { |ri| ri["relation_type"] == "IsPartOf" }.to_h.fetch("id", nil),
+          "SN" => Array.wrap(related_identifiers).find { |ri| ri["relation_type"] == "IsPartOf" }.to_h.fetch("related_identifier", nil),
           "ER" => ""
         }.compact.map { |k, v| v.is_a?(Array) ? v.map { |vi| "#{k}  - #{vi}" }.join("\r\n") : "#{k}  - #{v}" }.join("\r\n")
       end

data/lib/bolognese/writers/schema_org_writer.rb

@@ -10,22 +10,22 @@ module Bolognese
           "identifier" => to_schema_org_identifier(identifier, alternate_identifiers: alternate_identifiers),
           "url" => url,
           "additionalType" => types["resource_type"],
-          "name" => parse_attributes(title, content: "text", first: true),
+          "name" => parse_attributes(titles, content: "title", first: true),
           "author" => to_schema_org(creator),
           "editor" => to_schema_org(contributor),
-          "description" => parse_attributes(description, content: "text", first: true),
-          "license" => Array.wrap(rights).map { |l| l["id"] }.compact.unwrap,
+          "description" => parse_attributes(descriptions, content: "description", first: true),
+          "license" => Array.wrap(rights_list).map { |l| l["rights_uri"] }.compact.unwrap,
           "version" => version,
-          "keywords" => keywords.present? ? Array.wrap(keywords).map { |k| parse_attributes(k, content: "text", first: true) }.join(", ") : nil,
+          "keywords" => subjects.present? ? Array.wrap(subjects).map { |k| parse_attributes(k, content: "subject", first: true) }.join(", ") : nil,
           "inLanguage" => language,
-          "contentSize" => Array.wrap(size).unwrap,
+          "contentSize" => Array.wrap(sizes).unwrap,
           "encodingFormat" => Array.wrap(formats).unwrap,
           "dateCreated" => get_date(dates, "Created"),
           "datePublished" => get_date(dates, "Issued"),
           "dateModified" => get_date(dates, "Updated"),
           "pageStart" => first_page,
           "pageEnd" => last_page,
-          "spatialCoverage" => to_schema_org_spatial_coverage(geo_location),
+          "spatialCoverage" => to_schema_org_spatial_coverage(geo_locations),
           "sameAs" => to_schema_org_relation(related_identifiers: related_identifiers, relation_type: "IsIdenticalTo"),
           "isPartOf" => to_schema_org_relation(related_identifiers: related_identifiers, relation_type: "IsPartOf"),
           "hasPart" => to_schema_org_relation(related_identifiers: related_identifiers, relation_type: "HasPart"),

data/spec/author_utils_spec.rb

@@ -85,7 +85,7 @@ describe Bolognese::Metadata, vcr: true do
       subject = Bolognese::Metadata.new(input: input, from: "datacite")
       meta = Maremma.from_xml(subject.raw).fetch("resource", {})
       response = subject.get_authors(meta.dig("creators", "creator"))
-      expect(response).to eq("name" => "Enos, Ryan (Harvard University); Fowler, Anthony (University Of Chicago); Vavreck, Lynn (UCLA)")
+      expect(response).to eq([{"name" => "Enos, Ryan (Harvard University); Fowler, Anthony (University Of Chicago); Vavreck, Lynn (UCLA)"}])
     end
 
     it "hyper-authorship" do

data/spec/datacite_utils_spec.rb

@@ -19,7 +19,7 @@ describe Bolognese::Metadata, vcr: true do
     it "insert" do
       xml = Nokogiri::XML::Builder.new(:encoding => 'UTF-8') { |xml| subject.insert_creators(xml) }.to_xml
       response = Maremma.from_xml(xml)
-      expect(response.dig("creators", "creator").first).to eq("creatorName"=>"Ollomo, Benjamin", "givenName"=>"Benjamin", "familyName"=>"Ollomo")
+      expect(response.dig("creators", "creator").first).to eq("creatorName"=>{"__content__"=>"Ollomo, Benjamin", "nameType"=>"Personal"}, "familyName"=>"Ollomo", "givenName"=>"Benjamin")
     end
   end
 
@@ -117,7 +117,7 @@ describe Bolognese::Metadata, vcr: true do
   context "insert_related_identifiers" do
     it "related_identifier" do
       expect(subject.related_identifiers.length).to eq(6)
-      expect(subject.related_identifiers.first).to eq("id"=>"10.5061/dryad.8515/1", "related_identifier_type"=>"DOI", "relation_type"=>"HasPart")
+      expect(subject.related_identifiers.first).to eq("related_identifier"=>"10.5061/dryad.8515/1", "related_identifier_type"=>"DOI", "relation_type"=>"HasPart")
     end
 
     it "insert" do

data/spec/fixtures/crosscite.json

@@ -9,37 +9,47 @@
         "bibtex": "misc",
         "ris": "COMP"
     },
-    "creator": {
+    "creator": [{
         "type": "Person",
         "name": "Kristian Garza",
         "givenName": "Kristian",
         "familyName": "Garza"
-    },
-    "title": [{
-        "text": "Analysis Tools for Crossover Experiment of UI using Choice Architecture"
+    }],
+    "titles": [{
+        "title": "Analysis Tools for Crossover Experiment of UI using Choice Architecture"
     }],
     "publisher": "Zenodo",
-    "keywords": ["choice architecture", "crossover experiment", "hci"],
+    "subjects": [
+        {
+          "subject": "choice architecture" 
+        },
+        {
+          "subject": "crossover experiment"
+        },
+        {
+          "subject": "hci"
+        }    
+    ],
     "dates": {
         "date": "2016-03-27",
         "date-type": "Issued"
     },
     "publication_year": "2016",
-    "alternate_identifiers": {
-        "type": "URL",
-        "name": "http://zenodo.org/record/48440"
-    },
-    "rights": [{
-            "name": "Open Access"
+    "alternate_identifiers": [{
+        "alternative_identifier_type": "URL",
+        "alternative_identifier": "http://zenodo.org/record/48440"
+    }],
+    "rights_list": [{
+            "rights": "Open Access"
         },
         {
-            "id": "https://creativecommons.org/licenses/by-nc-sa/4.0",
-            "name": "Creative Commons Attribution-NonCommercial-ShareAlike"
+            "rights_uri": "https://creativecommons.org/licenses/by-nc-sa/4.0",
+            "rights": "Creative Commons Attribution-NonCommercial-ShareAlike"
         }
     ],
-    "description": [{
-        "type": "Abstract",
-        "text": "This tools are used to analyse the data produced by the Crosssover Experiment I designed to test Choice Architecture techniques as UI interventions in a SEEk4Science data catalogue. It contains:\n\n- Data structures for the experimental data.<br>\n- Visualisation functions<br>\n- Analysis functions\n\n## Installation\n\n- R<br>\n- python<br>\n- ipython 4\n\nClone and use.\n\n## Usage\n\n<br>\n```python<br>\nsource('parallel_plot.r')<br>\nwith(z, parallelset(trt,response, freq=count, alpha=0.2))<br>\n```\n\n<br>\n## Contributing\n\n1. Fork it!<br>\n2. Create your feature branch: `git checkout -b my-new-feature`<br>\n3. Commit your changes: `git commit -am 'Add some feature'`<br>\n4. Push to the branch: `git push origin my-new-feature`<br>\n5. Submit a pull request :D\n\n<br>\n## License\n\nThis work supports my PhD Thesis at University of Manchester."
+    "descriptions": [{
+        "description_type": "Abstract",
+        "description": "This tools are used to analyse the data produced by the Crosssover Experiment I designed to test Choice Architecture techniques as UI interventions in a SEEk4Science data catalogue. It contains:\n\n- Data structures for the experimental data.<br>\n- Visualisation functions<br>\n- Analysis functions\n\n## Installation\n\n- R<br>\n- python<br>\n- ipython 4\n\nClone and use.\n\n## Usage\n\n<br>\n```python<br>\nsource('parallel_plot.r')<br>\nwith(z, parallelset(trt,response, freq=count, alpha=0.2))<br>\n```\n\n<br>\n## Contributing\n\n1. Fork it!<br>\n2. Create your feature branch: `git checkout -b my-new-feature`<br>\n3. Commit your changes: `git commit -am 'Add some feature'`<br>\n4. Push to the branch: `git push origin my-new-feature`<br>\n5. Submit a pull request :D\n\n<br>\n## License\n\nThis work supports my PhD Thesis at University of Manchester."
     }],
     "schema_version": "http://datacite.org/schema/kernel-4",
     "provider": "DataCite",

data/spec/fixtures/datacite.json

@@ -9,22 +9,28 @@
     "ris": "RPRT"
   },
   "doi": "10.5438/4K3M-NYVG",
-  "creator": {
+  "creator": [{
     "type": "Person",
     "id": "http://orcid.org/0000-0003-1419-2405",
     "name": "Fenner, Martin",
     "givenName": "Martin",
     "familyName": "Fenner"
-  },
-  "title": [{
-    "text": "Eating your own Dog Food"
+  }],
+  "titles": [{
+    "title": "Eating your own Dog Food"
   }],
   "publisher": "DataCite",
   "publication-year": "2016",
-  "subject": [
-    "datacite",
-    "doi",
-    "metadata"
+  "subjects": [
+    {
+      "subject": "datacite"
+    },
+    {
+      "subject": "doi"
+    },
+    {
+      "subject": "metadata"
+    }
   ],
   "dates": [
     { 
@@ -48,25 +54,25 @@
   ],
   "related-identifiers": [
     {
-      "id": "10.5438/0000-00ss",
+      "related-identifier": "10.5438/0000-00ss",
       "related-identifier-type": "DOI",
       "relation-type": "IsPartOf"
     },
     {
-      "id": "10.5438/0012",
+      "related-identifier": "10.5438/0012",
       "related-identifier-type": "DOI",
       "relation-type": "References"
     },
     {
-      "id": "10.5438/55e5-t5c0",
+      "related-identifier": "10.5438/55e5-t5c0",
       "related-identifier-type": "DOI",
       "relation-type": "References"
     }
   ],
   "version": "1.0",
-  "description": [{
-    "type": "Abstract",
-    "text": "Eating your own dog food is a slang term to describe that an organization should itself use the products and services it provides. For DataCite this means that we should use DOIs with appropriate metadata and strategies for long-term preservation for..."
+  "descriptions": [{
+    "description-type": "Abstract",
+    "description": "Eating your own dog food is a slang term to describe that an organization should itself use the products and services it provides. For DataCite this means that we should use DOIs with appropriate metadata and strategies for long-term preservation for..."
   }],
   "schema-version": "http://datacite.org/schema/kernel-4",
   "provider": "DataCite"

data/spec/fixtures/datacite_software.json

@@ -1,17 +1,21 @@
 {
   "id": "https://doi.org/10.5063/f1m61h5x",
+  "types": {
+    "resource-type-general": "Software",
+    "resource-type": "Software"
+  },
   "doi": "10.5063/F1M61H5X",
-  "creator": {
+  "creator": [{
     "type": "Person",
     "name": "Matthew B. Jones",
     "givenName": "Matthew B.",
     "familyName": "Jones"
-  },
-  "title": "dataone: R interface to the DataONE network of data repositories",
+  }],
+  "titles": [{
+    "title": "dataone: R interface to the DataONE network of data repositories"
+  }],
   "publisher": "KNB Data Repository",
   "publication-year": "2016",
-  "resource-type-general": "Software",
-  "resource-type": "Software",
-  "schemaVersion": "http://datacite.org/schema/kernel-3",
+  "schema-version": "http://datacite.org/schema/kernel-3",
   "provider": "DataCite"
 }

data/spec/readers/bibtex_reader_spec.rb

@@ -33,12 +33,12 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.url).to eq("http://elifesciences.org/lookup/doi/10.7554/eLife.01567")
       expect(subject.creator.length).to eq(5)
       expect(subject.creator.first).to eq("type"=>"Person", "name"=>"Martial Sankar", "givenName"=>"Martial", "familyName"=>"Sankar")
-      expect(subject.title).to eq([{"text"=>"Automated quantitative histology reveals vascular morphodynamics during Arabidopsis hypocotyl secondary growth"}])
-      expect(subject.description.first["text"]).to start_with("Among various advantages, their small size makes model organisms preferred subjects of investigation.")
-      expect(subject.rights.first["id"]).to eq("http://creativecommons.org/licenses/by/3.0/")
+      expect(subject.titles).to eq([{"title"=>"Automated quantitative histology reveals vascular morphodynamics during Arabidopsis hypocotyl secondary growth"}])
+      expect(subject.descriptions.first["description"]).to start_with("Among various advantages, their small size makes model organisms preferred subjects of investigation.")
+      expect(subject.rights_list.first["rights_uri"]).to eq("http://creativecommons.org/licenses/by/3.0/")
       expect(subject.dates).to eq([{"date"=>"2014", "date_type"=>"Issued"}])
       expect(subject.publication_year).to eq("2014")
-      expect(subject.related_identifiers).to eq([{"id"=>"2050-084X", "related_identifier_type"=>"ISSN", "relation_type"=>"IsPartOf", "title"=>"eLife", "type"=>"Periodical"}])
+      expect(subject.related_identifiers).to eq([{"related_identifier"=>"2050-084X", "related_identifier_type"=>"ISSN", "relation_type"=>"IsPartOf", "title"=>"eLife", "type"=>"Periodical"}])
     end
 
     it "DOI does not exist" do
@@ -50,8 +50,8 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.identifier).to eq("https://doi.org/10.7554/elife.01567")
       expect(subject.types).to eq("bibtex"=>"phdthesis", "citeproc"=>"thesis", "resource_type"=>"Dissertation", "resource_type_general"=>"Text", "ris"=>"THES", "type"=>"Thesis")
       expect(subject.creator).to eq([{"type"=>"Person", "name"=>"Y. Toparlar", "givenName"=>"Y.", "familyName"=>"Toparlar"}])
-      expect(subject.title).to eq([{"text"=>"A multiscale analysis of the urban heat island effect: from city averaged temperatures to the energy demand of individual buildings"}])
-      expect(subject.description.first["text"]).to start_with("Designing the climates of cities")
+      expect(subject.titles).to eq([{"title"=>"A multiscale analysis of the urban heat island effect: from city averaged temperatures to the energy demand of individual buildings"}])
+      expect(subject.descriptions.first["description"]).to start_with("Designing the climates of cities")
       expect(subject.dates).to eq([{"date"=>"2018", "date_type"=>"Issued"}])
       expect(subject.publication_year).to eq("2018")
     end

data/spec/readers/citeproc_reader_spec.rb

@@ -19,9 +19,9 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.identifier).to eq("https://doi.org/10.5438/4k3m-nyvg")
       expect(subject.url).to eq("https://blog.datacite.org/eating-your-own-dog-food")
       expect(subject.types).to eq("bibtex"=>"article", "citeproc"=>"post-weblog", "resource_type_general"=>"Text", "ris"=>"GEN", "type"=>"BlogPosting")
-      expect(subject.creator).to eq("type"=>"Person", "name"=>"Martin Fenner", "givenName"=>"Martin", "familyName"=>"Fenner")
-      expect(subject.title).to eq([{"text"=>"Eating your own Dog Food"}])
-      expect(subject.description.first["text"]).to start_with("Eating your own dog food")
+      expect(subject.creator).to eq([{"familyName"=>"Fenner", "givenName"=>"Martin", "name"=>"Martin Fenner", "type"=>"Person"}])
+      expect(subject.titles).to eq([{"title"=>"Eating your own Dog Food"}])
+      expect(subject.descriptions.first["description"]).to start_with("Eating your own dog food")
       expect(subject.dates).to eq([{"date"=>"2016-12-20", "date_type"=>"Issued"}])
       expect(subject.publication_year).to eq("2016")
     end

data/spec/readers/codemeta_reader_spec.rb

@@ -21,10 +21,10 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.identifier).to eq("https://doi.org/10.5438/qeg0-3gm3")
       expect(subject.url).to eq("https://github.com/datacite/maremma")
       expect(subject.types).to eq("bibtex"=>"misc", "citeproc"=>"article-journal", "resource_type_general"=>"Software", "ris"=>"COMP", "type"=>"SoftwareSourceCode")
-      expect(subject.creator).to eq("type"=>"Person", "id"=>"http://orcid.org/0000-0003-0077-4738", "name"=>"Martin Fenner", "givenName"=>"Martin", "familyName"=>"Fenner")
-      expect(subject.title).to eq([{"text"=>"Maremma: a Ruby library for simplified network calls"}])
-      expect(subject.description.first["text"]).to start_with("Ruby utility library for network requests")
-      expect(subject.keywords).to eq(["faraday", "excon", "net/http"])
+      expect(subject.creator).to eq([{"type"=>"Person", "id"=>"http://orcid.org/0000-0003-0077-4738", "name"=>"Martin Fenner", "givenName"=>"Martin", "familyName"=>"Fenner"}])
+      expect(subject.titles).to eq([{"title"=>"Maremma: a Ruby library for simplified network calls"}])
+      expect(subject.descriptions.first["description"]).to start_with("Ruby utility library for network requests")
+      expect(subject.subjects).to eq([{"subject"=>"faraday"}, {"subject"=>"excon"}, {"subject"=>"net/http"}])
       expect(subject.dates).to eq([{"date"=>"2017-02-24", "date_type"=>"Issued"}, {"date"=>"2015-11-28", "date_type"=>"Created"}, {"date"=>"2017-02-24", "date_type"=>"Updated"}])
       expect(subject.publication_year).to eq("2017")
       expect(subject.publisher).to eq("DataCite")
@@ -47,9 +47,9 @@ describe Bolognese::Metadata, vcr: true do
                                       "givenName"=>"Peter",
                                       "familyName"=>"Slaughter"},
                                      {"type"=>"Organization", "name"=>"University Of California, Santa Barbara"}])
-      expect(subject.title).to eq([{"text"=>"R Interface to the DataONE REST API"}])
-      expect(subject.description.first["text"]).to start_with("Provides read and write access to data and metadata")
-      expect(subject.keywords).to eq(["data sharing", "data repository", "DataONE"])
+      expect(subject.titles).to eq([{"title"=>"R Interface to the DataONE REST API"}])
+      expect(subject.descriptions.first["description"]).to start_with("Provides read and write access to data and metadata")
+      expect(subject.subjects).to eq([{"subject"=>"data sharing"}, {"subject"=>"data repository"}, {"subject"=>"DataONE"}])
       expect(subject.version).to eq("2.0.0")
       expect(subject.dates).to eq([{"date"=>"2016-05-27", "date_type"=>"Issued"}, {"date"=>"2016-05-27", "date_type"=>"Created"}, {"date"=>"2016-05-27", "date_type"=>"Updated"}])
       expect(subject.publication_year).to eq("2016")
@@ -63,10 +63,10 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.identifier).to eq("https://doi.org/10.5438/qeg0-3gm3")
       expect(subject.url).to eq("https://github.com/datacite/maremma")
       expect(subject.types).to eq("bibtex"=>"misc", "citeproc"=>"article-journal", "resource_type_general"=>"Software", "ris"=>"COMP", "type"=>"SoftwareSourceCode")
-      expect(subject.creator).to eq("type"=>"Person", "id"=>"http://orcid.org/0000-0003-0077-4738", "name"=>"Martin Fenner", "givenName"=>"Martin", "familyName"=>"Fenner")
-      expect(subject.title).to eq([{"text"=>"Maremma: a Ruby library for simplified network calls"}])
-      expect(subject.description.first["text"]).to start_with("Simplifies network calls")
-      expect(subject.keywords).to eq(["faraday", "excon", "net/http"])
+      expect(subject.creator).to eq([{"type"=>"Person", "id"=>"http://orcid.org/0000-0003-0077-4738", "name"=>"Martin Fenner", "givenName"=>"Martin", "familyName"=>"Fenner"}])
+      expect(subject.titles).to eq([{"title"=>"Maremma: a Ruby library for simplified network calls"}])
+      expect(subject.descriptions.first["description"]).to start_with("Simplifies network calls")
+      expect(subject.subjects).to eq([{"subject"=>"faraday"}, {"subject"=>"excon"}, {"subject"=>"net/http"}])
       expect(subject.dates).to eq([{"date"=>"2017-02-24", "date_type"=>"Issued"}, {"date"=>"2015-11-28", "date_type"=>"Created"}, {"date"=>"2017-02-24", "date_type"=>"Updated"}])
       expect(subject.publication_year).to eq("2017")
       expect(subject.publisher).to eq("DataCite")
@@ -81,9 +81,9 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.types).to eq("bibtex"=>"misc", "citeproc"=>"article-journal", "resource_type_general"=>"Software", "ris"=>"COMP", "type"=>"SoftwareSourceCode")
       expect(subject.creator.size).to eq(4)
       expect(subject.creator.last).to eq("type"=>"Person", "id"=>"https://orcid.org/0000-0001-8135-3489", "name"=>"Lars Holm Nielsen", "givenName"=>"Lars Holm", "familyName"=>"Nielsen")
-      expect(subject.title).to eq([{"text"=>"DOI Registrations for Software"}])
-      expect(subject.description.first["text"]).to start_with("Analysis of DataCite DOIs registered for software")
-      expect(subject.keywords).to eq(["doi", "software", "codemeta"])
+      expect(subject.titles).to eq([{"title"=>"DOI Registrations for Software"}])
+      expect(subject.descriptions.first["description"]).to start_with("Analysis of DataCite DOIs registered for software")
+      expect(subject.subjects).to eq([{"subject"=>"doi"}, {"subject"=>"software"}, {"subject"=>"codemeta"}])
       expect(subject.dates).to eq([{"date"=>"2018-05-17", "date_type"=>"Issued"}, {"date"=>"2018-03-09", "date_type"=>"Created"}, {"date"=>"2018-05-17", "date_type"=>"Updated"}])
       expect(subject.publication_year).to eq("2018")
       expect(subject.publisher).to eq("DataCite")

data/spec/readers/crosscite_reader_spec.rb

@@ -15,13 +15,12 @@ describe Bolognese::Metadata, vcr: true do
 
   context "get crosscite metadata" do
     it "SoftwareSourceCode" do
-      puts subject.errors
-      #expect(subject.valid?).to be true
+      expect(subject.valid?).to be true
       expect(subject.identifier).to eq("https://doi.org/10.5281/zenodo.48440")
       expect(subject.types).to eq("bibtex"=>"misc", "citeproc"=>"other", "resource_type"=>"Software", "resource_type_general"=>"Software", "ris"=>"COMP", "type"=>"SoftwareSourceCode")
-      expect(subject.creator).to eq("type"=>"Person", "familyName" => "Garza", "givenName" => "Kristian", "name" => "Kristian Garza")
-      expect(subject.title).to eq([{"text"=>"Analysis Tools for Crossover Experiment of UI using Choice Architecture"}])
-      expect(subject.description.first["text"]).to start_with("This tools are used to analyse the data produced by the Crosssover Experiment")
+      expect(subject.creator).to eq([{"type"=>"Person", "familyName" => "Garza", "givenName" => "Kristian", "name" => "Kristian Garza"}])
+      expect(subject.titles).to eq([{"title"=>"Analysis Tools for Crossover Experiment of UI using Choice Architecture"}])
+      expect(subject.descriptions.first["description"]).to start_with("This tools are used to analyse the data produced by the Crosssover Experiment")
       expect(subject.dates).to eq("date"=>"2016-03-27", "date-type"=>"Issued")
       expect(subject.publication_year).to eq("2016")
     end
@@ -29,12 +28,12 @@ describe Bolognese::Metadata, vcr: true do
     it "SoftwareSourceCode as string" do
       input = IO.read(fixture_path + "crosscite.json")
       subject = Bolognese::Metadata.new(input: input)
-      #expect(subject.valid?).to be true
+      expect(subject.valid?).to be true
       expect(subject.identifier).to eq("https://doi.org/10.5281/zenodo.48440")
       expect(subject.types).to eq("bibtex"=>"misc", "citeproc"=>"other", "resource_type"=>"Software", "resource_type_general"=>"Software", "ris"=>"COMP", "type"=>"SoftwareSourceCode")
-      expect(subject.creator).to eq("type"=>"Person", "familyName" => "Garza", "givenName" => "Kristian", "name" => "Kristian Garza")
-      expect(subject.title).to eq([{"text"=>"Analysis Tools for Crossover Experiment of UI using Choice Architecture"}])
-      expect(subject.description.first["text"]).to start_with("This tools are used to analyse the data produced by the Crosssover Experiment")
+      expect(subject.creator).to eq([{"type"=>"Person", "familyName" => "Garza", "givenName" => "Kristian", "name" => "Kristian Garza"}])
+      expect(subject.titles).to eq([{"title"=>"Analysis Tools for Crossover Experiment of UI using Choice Architecture"}])
+      expect(subject.descriptions.first["description"]).to start_with("This tools are used to analyse the data produced by the Crosssover Experiment")
       expect(subject.dates).to eq("date"=>"2016-03-27", "date-type"=>"Issued")
       expect(subject.publication_year).to eq("2016")
     end

data/spec/readers/crossref_reader_spec.rb

@@ -23,23 +23,26 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.url).to eq("https://elifesciences.org/articles/01567")
       expect(subject.creator.length).to eq(5)
       expect(subject.creator.first).to eq("type"=>"Person", "name"=>"Martial Sankar", "givenName"=>"Martial", "familyName"=>"Sankar")
-      expect(subject.rights).to eq([{"id"=>"http://creativecommons.org/licenses/by/3.0"}])
-      expect(subject.title).to eq([{"text"=>"Automated quantitative histology reveals vascular morphodynamics during Arabidopsis hypocotyl secondary growth"}])
+      expect(subject.rights_list).to eq([{"rights_uri"=>"http://creativecommons.org/licenses/by/3.0"}])
+      expect(subject.titles).to eq([{"title"=>"Automated quantitative histology reveals vascular morphodynamics during Arabidopsis hypocotyl secondary growth"}])
       expect(subject.dates).to eq([{"date"=>"2014-02-11", "date_type"=>"Issued"}, {"date"=>"2018-08-23T13:41:49Z", "date_type"=>"Updated"}])
       expect(subject.publication_year).to eq("2014")
       expect(subject.periodical).to eq("issn"=>"2050-084X", "title"=>"eLife", "type"=>"Periodical")
       expect(subject.related_identifiers.length).to eq(27)
-      expect(subject.related_identifiers.first).to eq("id"=>"2050-084X", "related_identifier_type"=>"ISSN", "relation_type"=>"IsPartOf", "title"=>"eLife", "type"=>"Periodical")
-      expect(subject.related_identifiers.last).to eq("id" => "10.1038/ncb2764",
+      expect(subject.related_identifiers.first).to eq("related_identifier"=>"2050-084X", "related_identifier_type"=>"ISSN", "relation_type"=>"IsPartOf", "title"=>"eLife", "type"=>"Periodical")
+      expect(subject.related_identifiers.last).to eq("related_identifier" => "10.1038/ncb2764",
                                                      "related_identifier_type" => "DOI",
                                                      "relation_type" => "References",
                                                      "title" => "A screen for morphological complexity identifies regulators of switch-like transitions between discrete cell shapes")
       expect(subject.funding_references).to eq([{"funder_name"=>"SystemsX"},
         {"funder_identifier"=>"https://doi.org/10.13039/501100003043",
+         "funder_identifier_type"=>"Crossref Funder ID",
          "funder_name"=>"EMBO"},
         {"funder_identifier"=>"https://doi.org/10.13039/501100001711",
+         "funder_identifier_type"=>"Crossref Funder ID",
          "funder_name"=>"Swiss National Science Foundation"},
         {"funder_identifier"=>"https://doi.org/10.13039/501100006390",
+         "funder_identifier_type"=>"Crossref Funder ID",
          "funder_name"=>"University of Lausanne"}])
       expect(subject.service_provider).to eq("Crossref")
     end
@@ -54,14 +57,14 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.creator.length).to eq(5)
       expect(subject.creator.first).to eq("type"=>"Person", "name"=>"Markus Ralser", "givenName"=>"Markus", "familyName"=>"Ralser")
       expect(subject.contributor).to eq("contributorType"=>"Editor", "familyName"=>"Janbon", "givenName"=>"Guilhem", "name"=>"Guilhem Janbon", "type"=>"Person")
-      expect(subject.title).to eq([{"text"=>"Triose Phosphate Isomerase Deficiency Is Caused by Altered Dimerization–Not Catalytic Inactivity–of the Mutant Enzymes"}])
-      expect(subject.rights).to eq([{"id"=>"http://creativecommons.org/licenses/by/4.0"}])
+      expect(subject.titles).to eq([{"title"=>"Triose Phosphate Isomerase Deficiency Is Caused by Altered Dimerization–Not Catalytic Inactivity–of the Mutant Enzymes"}])
+      expect(subject.rights_list).to eq([{"rights_uri"=>"http://creativecommons.org/licenses/by/4.0"}])
       expect(subject.dates).to eq([{"date"=>"2006-12-20", "date_type"=>"Issued"}, {"date"=>"2017-06-17T12:26:15Z", "date_type"=>"Updated"}])
       expect(subject.publication_year).to eq("2006")
       expect(subject.first_page).to eq("e30")
       expect(subject.related_identifiers.length).to eq(62)
-      expect(subject.related_identifiers.first).to eq("id"=>"1932-6203", "related_identifier_type"=>"ISSN", "relation_type"=>"IsPartOf", "title"=>"PLoS ONE", "type"=>"Periodical")
-      expect(subject.related_identifiers.last).to eq("id"=>"10.1056/nejm199109123251104", "relation_type"=>"References", "related_identifier_type"=>"DOI", "title"=>"Efficacy of statewide neonatal screening for cystic fibrosis by assay of trypsinogen concentrations.")
+      expect(subject.related_identifiers.first).to eq("related_identifier"=>"1932-6203", "related_identifier_type"=>"ISSN", "relation_type"=>"IsPartOf", "title"=>"PLoS ONE", "type"=>"Periodical")
+      expect(subject.related_identifiers.last).to eq("related_identifier"=>"10.1056/nejm199109123251104", "relation_type"=>"References", "related_identifier_type"=>"DOI", "title"=>"Efficacy of statewide neonatal screening for cystic fibrosis by assay of trypsinogen concentrations.")
       expect(subject.periodical).to eq("issn"=>"1932-6203", "title"=>"PLoS ONE", "type"=>"Periodical")
       expect(subject.service_provider).to eq("Crossref")
     end
@@ -75,9 +78,9 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.types).to eq("bibtex"=>"article", "citeproc"=>"article-journal", "resource_type"=>"PostedContent", "resource_type_general"=>"Text", "ris"=>"JOUR", "type"=>"ScholarlyArticle")
       expect(subject.creator.count).to eq(11)
       expect(subject.creator.last).to eq("type"=>"Person", "id"=>"http://orcid.org/0000-0003-4060-7360", "name"=>"Timothy Clark", "givenName"=>"Timothy", "familyName"=>"Clark")
-      expect(subject.title).to eq([{"text"=>"A Data Citation Roadmap for Scholarly Data Repositories"}])
-      expect(subject.alternate_identifiers).to eq("biorxiv;097196v2")
-      expect(subject.description.first["text"]).to start_with("This article presents a practical roadmap")
+      expect(subject.titles).to eq([{"title"=>"A Data Citation Roadmap for Scholarly Data Repositories"}])
+      expect(subject.alternate_identifiers).to eq("alternate_identifier"=>"biorxiv;097196v2", "alternate_identifier_type"=>"Publisher ID")
+      expect(subject.descriptions.first["description"]).to start_with("This article presents a practical roadmap")
       expect(subject.dates).to eq([{"date"=>"2017-10-09", "date_type"=>"Issued"}, {"date"=>"2017-10-10T05:10:49Z", "date_type"=>"Updated"}])
       expect(subject.publication_year).to eq("2017")
       expect(subject.publisher).to eq("bioRxiv")
@@ -92,15 +95,15 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.url).to eq("http://doi.wiley.com/10.1890/0012-9658(2006)87[2832:TIOPMA]2.0.CO;2")
       expect(subject.types).to eq("bibtex"=>"article", "citeproc"=>"article-journal", "resource_type"=>"JournalArticle", "resource_type_general"=>"Text", "ris"=>"JOUR", "type"=>"ScholarlyArticle")
       expect(subject.creator).to eq([{"type"=>"Person", "name"=>"A. Fenton", "givenName"=>"A.", "familyName"=>"Fenton"}, {"type"=>"Person", "name"=>"S. A. Rands", "givenName"=>"S. A.", "familyName"=>"Rands"}])
-      expect(subject.rights).to eq([{"id"=>"http://doi.wiley.com/10.1002/tdm_license_1.1"}])
-      expect(subject.title).to eq([{"text"=>"THE IMPACT OF PARASITE MANIPULATION AND PREDATOR FORAGING BEHAVIOR ON PREDATOR–PREY COMMUNITIES"}])
+      expect(subject.rights_list).to eq([{"rights_uri"=>"http://doi.wiley.com/10.1002/tdm_license_1.1"}])
+      expect(subject.titles).to eq([{"title"=>"THE IMPACT OF PARASITE MANIPULATION AND PREDATOR FORAGING BEHAVIOR ON PREDATOR–PREY COMMUNITIES"}])
       expect(subject.dates).to eq([{"date"=>"2006-11", "date_type"=>"Issued"}, {"date"=>"2018-08-02T21:20:01Z", "date_type"=>"Updated"}])
       expect(subject.publication_year).to eq("2006")
       expect(subject.first_page).to eq("2832")
       expect(subject.last_page).to eq("2841")
       expect(subject.related_identifiers.length).to eq(34)
-      expect(subject.related_identifiers.first).to eq("id"=>"0012-9658", "related_identifier_type"=>"ISSN", "relation_type"=>"IsPartOf", "title"=>"Ecology", "type"=>"Periodical")
-      expect(subject.related_identifiers.last).to eq("id"=>"10.1098/rspb.2002.2213", "related_identifier_type"=>"DOI", "relation_type"=>"References")
+      expect(subject.related_identifiers.first).to eq("related_identifier"=>"0012-9658", "related_identifier_type"=>"ISSN", "relation_type"=>"IsPartOf", "title"=>"Ecology", "type"=>"Periodical")
+      expect(subject.related_identifiers.last).to eq("related_identifier"=>"10.1098/rspb.2002.2213", "related_identifier_type"=>"DOI", "relation_type"=>"References")
       expect(subject.periodical).to eq("issn"=>"0012-9658", "title"=>"Ecology", "type"=>"Periodical")
       expect(subject.service_provider).to eq("Crossref")
     end
@@ -114,15 +117,15 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.types).to eq("bibtex"=>"article", "citeproc"=>"article-journal", "resource_type"=>"JournalArticle", "resource_type_general"=>"Text", "ris"=>"JOUR", "type"=>"ScholarlyArticle")
       expect(subject.creator.length).to eq(7)
       expect(subject.creator[2]).to eq("type"=>"Person", "id"=>"http://orcid.org/0000-0003-2043-4925", "name"=>"Beatriz Hernandez", "givenName"=>"Beatriz", "familyName"=>"Hernandez")
-      expect(subject.rights).to eq([{"id"=>"http://creativecommons.org/licenses/by/3.0"}])
-      expect(subject.title).to eq([{"text"=>"Delineating a Retesting Zone Using Receiver Operating Characteristic Analysis on Serial QuantiFERON Tuberculosis Test Results in US Healthcare Workers"}])
+      expect(subject.rights_list).to eq([{"rights_uri"=>"http://creativecommons.org/licenses/by/3.0"}])
+      expect(subject.titles).to eq([{"title"=>"Delineating a Retesting Zone Using Receiver Operating Characteristic Analysis on Serial QuantiFERON Tuberculosis Test Results in US Healthcare Workers"}])
       expect(subject.dates).to eq([{"date"=>"2012", "date_type"=>"Issued"}, {"date"=>"2016-08-02T18:42:41Z", "date_type"=>"Updated"}])
       expect(subject.publication_year).to eq("2012")
       expect(subject.first_page).to eq("1")
       expect(subject.last_page).to eq("7")
       expect(subject.related_identifiers.length).to eq(18)
-      expect(subject.related_identifiers.first).to eq("id"=>"2090-1836", "related_identifier_type"=>"ISSN", "relation_type"=>"IsPartOf", "title"=>"Pulmonary Medicine", "type"=>"Periodical")
-      expect(subject.related_identifiers.last).to eq("id"=>"10.1378/chest.12-0045", "related_identifier_type"=>"DOI", "relation_type"=>"References")
+      expect(subject.related_identifiers.first).to eq("related_identifier"=>"2090-1836", "related_identifier_type"=>"ISSN", "relation_type"=>"IsPartOf", "title"=>"Pulmonary Medicine", "type"=>"Periodical")
+      expect(subject.related_identifiers.last).to eq("related_identifier"=>"10.1378/chest.12-0045", "related_identifier_type"=>"DOI", "relation_type"=>"References")
       expect(subject.periodical).to eq("issn"=>"2090-1836", "title"=>"Pulmonary Medicine", "type"=>"Periodical")
       expect(subject.service_provider).to eq("Crossref")
     end
@@ -136,10 +139,10 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.types).to eq("bibtex"=>"article", "citeproc"=>"article-journal", "resource_type"=>"JournalArticle", "resource_type_general"=>"Text", "ris"=>"JOUR", "type"=>"ScholarlyArticle")
       expect(subject.creator.length).to eq(10)
       expect(subject.creator.first).to eq("type"=>"Person", "name"=>"Sarah E. Beck", "givenName"=>"Sarah E.", "familyName"=>"Beck")
-      expect(subject.title).to eq([{"text"=>"Paving the path to HIV neurotherapy: Predicting SIV CNS disease"}])
+      expect(subject.titles).to eq([{"title"=>"Paving the path to HIV neurotherapy: Predicting SIV CNS disease"}])
       expect(subject.dates).to eq([{"date"=>"2015-07", "date_type"=>"Issued"}, {"date"=>"2017-06-23T08:44:48Z", "date_type"=>"Updated"}])
       expect(subject.publication_year).to eq("2015")
-      expect(subject.related_identifiers).to eq([{"id"=>"00142999", "related_identifier_type"=>"ISSN", "relation_type"=>"IsPartOf", "title"=>"European Journal of Pharmacology", "type"=>"Periodical"}])
+      expect(subject.related_identifiers).to eq([{"related_identifier"=>"00142999", "related_identifier_type"=>"ISSN", "relation_type"=>"IsPartOf", "title"=>"European Journal of Pharmacology", "type"=>"Periodical"}])
       expect(subject.periodical).to eq("issn"=>"00142999", "title"=>"European Journal of Pharmacology", "type"=>"Periodical")
       expect(subject.service_provider).to eq("Crossref")
     end
@@ -153,8 +156,8 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.types).to eq("bibtex"=>"misc", "citeproc"=>"article-journal", "resource_type"=>"SaComponent", "resource_type_general"=>"Text", "ris"=>"JOUR", "type"=>"ScholarlyArticle")
       expect(subject.creator.length).to eq(2)
       expect(subject.creator.first).to eq("type"=>"Person", "name"=>"G. Fermi", "givenName"=>"G.", "familyName"=>"Fermi")
-      expect(subject.title).to eq([{"text"=>"THE CRYSTAL STRUCTURE OF HUMAN DEOXYHAEMOGLOBIN AT 1.74 ANGSTROMS RESOLUTION"}])
-      expect(subject.description).to eq([{"text"=>"x-ray diffraction structure", "type"=>"Other"}])
+      expect(subject.titles).to eq([{"title"=>"THE CRYSTAL STRUCTURE OF HUMAN DEOXYHAEMOGLOBIN AT 1.74 ANGSTROMS RESOLUTION"}])
+      expect(subject.descriptions).to eq([{"description"=>"x-ray diffraction structure", "description_type"=>"Other"}])
       expect(subject.dates).to eq([{"date"=>"1984-07-17", "date_type"=>"Issued"}, {"date"=>"2014-05-27T16:45:59Z", "date_type"=>"Updated"}])
       expect(subject.publication_year).to eq("1984")
       expect(subject.publisher).to eq("(:unav)")
@@ -170,7 +173,7 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.types).to eq("bibtex"=>"inbook", "citeproc"=>"chapter", "resource_type"=>"BookChapter", "resource_type_general"=>"Text", "ris"=>"CHAP", "type"=>"Chapter")
       expect(subject.creator.length).to eq(2)
       expect(subject.creator.first).to eq("type"=>"Person", "name"=>"Ronald L. Diercks", "givenName"=>"Ronald L.", "familyName"=>"Diercks")
-      expect(subject.title).to eq([{"text"=>"Clinical Symptoms and Physical Examinations"}])
+      expect(subject.titles).to eq([{"title"=>"Clinical Symptoms and Physical Examinations"}])
       expect(subject.dates).to eq([{"date"=>"2015", "date_type"=>"Issued"}, {"date"=>"2015-04-14T02:31:13Z", "date_type"=>"Updated"}])
       expect(subject.publication_year).to eq("2015")
       expect(subject.publisher).to eq("Springer Berlin Heidelberg")
@@ -186,13 +189,13 @@ describe Bolognese::Metadata, vcr: true do
       expect(subject.types).to eq("bibtex"=>"article", "citeproc"=>"article-journal", "resource_type"=>"JournalArticle", "resource_type_general"=>"Text", "ris"=>"JOUR", "type"=>"ScholarlyArticle")
       expect(subject.creator.length).to eq(3)
       expect(subject.creator.first).to eq("type"=>"Person", "id"=>"http://orcid.org/0000-0002-4156-3761", "name"=>"Nico Dissmeyer", "givenName"=>"Nico", "familyName"=>"Dissmeyer")
-      expect(subject.title).to eq([{"text"=>"Life and death of proteins after protease cleavage: protein degradation by the N-end rule pathway"}])
-      expect(subject.rights).to eq([{"id"=>"http://doi.wiley.com/10.1002/tdm_license_1.1"}, {"id"=>"http://onlinelibrary.wiley.com/termsAndConditions"}])
+      expect(subject.titles).to eq([{"title"=>"Life and death of proteins after protease cleavage: protein degradation by the N-end rule pathway"}])
+      expect(subject.rights_list).to eq([{"rights_uri"=>"http://doi.wiley.com/10.1002/tdm_license_1.1"}, {"rights_uri"=>"http://onlinelibrary.wiley.com/termsAndConditions"}])
       expect(subject.dates).to eq([{"date"=>"2018-05", "date_type"=>"Issued"}, {"date"=>"2018-08-07T05:52:14Z", "date_type"=>"Updated"}])
       expect(subject.publication_year).to eq("2018")
       expect(subject.related_identifiers.length).to eq(49)
-      expect(subject.related_identifiers.first).to eq("id"=>"0028646X", "related_identifier_type"=>"ISSN", "relation_type"=>"IsPartOf", "title"=>"New Phytologist", "type"=>"Periodical")
-      expect(subject.related_identifiers.last).to eq("id"=>"10.1002/pmic.201400530", "relation_type"=>"References", "related_identifier_type"=>"DOI", "title"=>"Quantitative proteomics analysis of the Arg/N-end rule pathway of targeted degradation in Arabidopsis roots")
+      expect(subject.related_identifiers.first).to eq("related_identifier"=>"0028646X", "related_identifier_type"=>"ISSN", "relation_type"=>"IsPartOf", "title"=>"New Phytologist", "type"=>"Periodical")
+      expect(subject.related_identifiers.last).to eq("related_identifier"=>"10.1002/pmic.201400530", "relation_type"=>"References", "related_identifier_type"=>"DOI", "title"=>"Quantitative proteomics analysis of the Arg/N-end rule pathway of targeted degradation in Arabidopsis roots")
       expect(subject.periodical).to eq("issn"=>"0028646X", "title"=>"New Phytologist", "type"=>"Periodical")
       expect(subject.service_provider).to eq("Crossref")
     end