bolognese 0.7.2 → 0.8

data/spec/array_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe Array do
+  describe "unwrap" do
+    it "to array" do
+      arr = [1, 2, 3]
+      expect(arr.unwrap).to eq(arr)
+    end
+
+    it "to integer" do
+      arr = [1]
+      expect(arr.unwrap).to eq(1)
+    end
+
+    it "to nil" do
+      arr = []
+      expect(arr.unwrap).to be_nil
+    end
+  end
+end

data/spec/author_utils_spec.rb

@@ -1,29 +1,113 @@
 require 'spec_helper'
 
 describe Bolognese::Crossref, vcr: true do
-  let(:id) { "https://doi.org/10.1371/journal.pone.0000030" }
+  let(:id) { "https://doi.org/10.1101/097196" }
 
   subject { Bolognese::Crossref.new(id: id) }
 
+  context "is_personal_name?" do
+    it "has type person" do
+      author = {"type"=>"Person", "name"=>"Martin Fenner" }
+      expect(subject.is_personal_name?(author)).to be true
+    end
+
+    it "has type organization" do
+      author = {"email"=>"info@ucop.edu", "name"=>"University of California, Santa Barbara", "role"=>{"namespace"=>"http://www.ngdc.noaa.gov/metadata/published/xsd/schema/resources/Codelist/gmxCodelists.xml#CI_RoleCode", "roleCode"=>"copyrightHolder"}, "type"=>"organization" }
+      expect(subject.is_personal_name?(author)).to be false
+    end
+
+    it "has id" do
+      author = {"id"=>"http://orcid.org/0000-0003-1419-2405", "givenName"=>"Martin", "familyName"=>"Fenner", "name"=>"Martin Fenner" }
+      expect(subject.is_personal_name?(author)).to be true
+    end
+
+    it "has family name" do
+      author = {"givenName"=>"Martin", "familyName"=>"Fenner", "name"=>"Martin Fenner" }
+      expect(subject.is_personal_name?(author)).to be true
+    end
+
+    it "has comma" do
+      author = {"name"=>"Fenner, Martin" }
+      expect(subject.is_personal_name?(author)).to be true
+    end
+
+    it "has no info" do
+      author = {"name"=>"Martin Fenner" }
+      expect(subject.is_personal_name?(author)).to be false
+    end
+  end
+
+  context "get_one_author" do
+    it "has familyName" do
+      id = "https://doi.org/10.5438/4K3M-NYVG"
+      subject = Bolognese::Datacite.new(id: id)
+      response = subject.get_one_author(subject.metadata.dig("creators", "creator"))
+      expect(response).to eq("type"=>"Person", "id"=>"http://orcid.org/0000-0003-1419-2405", "name"=>"Fenner, Martin", "givenName"=>"Martin", "familyName"=>"Fenner")
+    end
+
+    it "has name in sort-order" do
+      id = "https://doi.org/10.5061/dryad.8515"
+      subject = Bolognese::Datacite.new(id: id)
+      response = subject.get_one_author(subject.metadata.dig("creators", "creator").first)
+      expect(response).to eq("type"=>"Person", "name"=>"Benjamin Ollomo", "givenName"=>"Benjamin", "familyName"=>"Ollomo")
+    end
+
+    it "has name in display-order" do
+      id = "https://doi.org/10.5281/ZENODO.48440"
+      subject = Bolognese::Datacite.new(id: id)
+      response = subject.get_one_author(subject.metadata.dig("creators", "creator"))
+      expect(response).to eq("type"=>"Person", "name"=>"Kristian Garza", "givenName"=>"Kristian", "familyName"=>"Garza")
+    end
+
+    it "has name in display-order with ORCID" do
+      id = "https://doi.org/10.6084/M9.FIGSHARE.4700788"
+      subject = Bolognese::Datacite.new(id: id)
+      response = subject.get_one_author(subject.metadata.dig("creators", "creator"))
+      expect(response).to eq("type"=>"Person", "id"=>"http://orcid.org/0000-0003-4881-1606", "name"=>"Andrea Bedini", "givenName"=>"Andrea", "familyName"=>"Bedini")
+    end
+
+    it "is organization" do
+      author = {"email"=>"info@ucop.edu", "name"=>"University of California, Santa Barbara", "role"=>{"namespace"=>"http://www.ngdc.noaa.gov/metadata/published/xsd/schema/resources/Codelist/gmxCodelists.xml#CI_RoleCode", "roleCode"=>"copyrightHolder"}, "type"=>"organization" }
+      response = subject.get_one_author(author)
+      expect(response).to eq("type"=>"Organization", "name"=>"University Of California, Santa Barbara")
+    end
+  end
+
+  context "get_name_identifier" do
+    it "has ORCID" do
+      id = "https://doi.org/10.5438/4K3M-NYVG"
+      subject = Bolognese::Datacite.new(id: id)
+      response = subject.get_name_identifier(subject.metadata.dig("creators", "creator"))
+      expect(response).to eq("http://orcid.org/0000-0003-1419-2405")
+    end
+
+    it "has no ORCID" do
+      id = "https://doi.org/10.4230/lipics.tqc.2013.93"
+      subject = Bolognese::Datacite.new(id: id)
+      response = subject.get_name_identifier(subject.metadata.dig("creators", "creator"))
+      expect(response).to be_nil
+    end
+  end
+
   context "authors_as_string" do
-    let(:author_with_organization) { [{"@type"=>"person",
-                                       "@id"=>"http://orcid.org/0000-0003-0077-4738",
+    let(:author_with_organization) { [{"type"=>"Person",
+                                       "id"=>"http://orcid.org/0000-0003-0077-4738",
                                        "name"=>"Matt Jones"},
-                                      {"@type"=>"person",
-                                       "@id"=>"http://orcid.org/0000-0002-2192-403X",
+                                      {"type"=>"Person",
+                                       "id"=>"http://orcid.org/0000-0002-2192-403X",
                                        "name"=>"Peter Slaughter"},
-                                      {"@type"=>"organization",
-                                       "@id"=>"http://orcid.org/0000-0002-3957-2474",
+                                      {"type"=>"Organization",
+                                       "id"=>"http://orcid.org/0000-0002-3957-2474",
                                        "name"=>"University of California, Santa Barbara"}] }
 
     it "author" do
       response = subject.authors_as_string(subject.author)
-      expect(response).to eq("Ralser, Markus and Heeren, Gino and Breitenbach, Michael and Lehrach, Hans and Krobitsch, Sylvia")
+      expect(response).to eq("Fenner, Martin and Crosas, Mercè and Grethe, Jeffrey and Kennedy, David and Hermjakob, Henning and Rocca-Serra, Philippe and Berjon, Robin and Karcher, Sebastian and Martone, Maryann and Clark, Timothy")
     end
 
     it "single author" do
       response = subject.authors_as_string(subject.author.first)
-      expect(response).to eq("Ralser, Markus")
+      expect(response).to eq("Fenner, Martin")
     end
 
     it "no author" do

data/spec/bibtex_spec.rb

@@ -16,11 +16,11 @@ describe Bolognese::Bibtex, vcr: true do
                                     {"@type"=>"Person", "givenName"=>"Laura", "familyName"=>"Ragni"},
                                     {"@type"=>"Person", "givenName"=>"Ioannis", "familyName"=>"Xenarios"},
                                     {"@type"=>"Person", "givenName"=>"Christian S", "familyName"=>"Hardtke"}])
-      expect(subject.name).to eq("Automated quantitative histology reveals vascular morphodynamics during Arabidopsis hypocotyl secondary growth")
-      expect(subject.description).to start_with("Among various advantages, their small size makes model organisms preferred subjects of investigation.")
-      expect(subject.license).to eq("http://creativecommons.org/licenses/by/3.0/")
+      expect(subject.title).to eq("Automated quantitative histology reveals vascular morphodynamics during Arabidopsis hypocotyl secondary growth")
+      expect(subject.description["text"]).to start_with("Among various advantages, their small size makes model organisms preferred subjects of investigation.")
+      expect(subject.license["id"]).to eq("http://creativecommons.org/licenses/by/3.0/")
       expect(subject.date_published).to eq("2014")
-      expect(subject.is_part_of).to eq("@type"=>"Periodical", "name"=>"eLife", "issn"=>"2050-084X")
+      expect(subject.is_part_of).to eq("type"=>"Periodical", "name"=>"eLife", "issn"=>"2050-084X")
     end
   end
 

data/spec/cli_spec.rb

@@ -56,6 +56,11 @@ describe Bolognese::CLI do
         subject.options = { to: "datacite" }
         expect { subject.convert id }.to output(/http:\/\/datacite.org\/schema\/kernel-3/).to_stdout
       end
+
+      it 'to datacite_json' do
+        subject.options = { to: "datacite_json" }
+        expect { subject.convert id }.to output(/François Renaud/).to_stdout
+      end
     end
 
     context "schema_org" do

data/spec/codemeta_spec.rb

@@ -11,21 +11,21 @@ describe Bolognese::Codemeta, vcr: true do
       expect(subject.id).to eq("https://doi.org/10.5438/qeg0-3gm3")
       expect(subject.url).to eq("https://github.com/datacite/maremma")
       expect(subject.type).to eq("SoftwareSourceCode")
-      expect(subject.author).to eq("@id"=>"http://orcid.org/0000-0003-0077-4738", "@type"=>"person", "name"=>"Martin Fenner")
-      expect(subject.name).to eq("Maremma: a Ruby library for simplified network calls")
-      expect(subject.description).to start_with("Simplifies network calls")
+      expect(subject.author).to eq("type"=>"Person", "id"=>"http://orcid.org/0000-0003-0077-4738", "name"=>"Martin Fenner", "givenName"=>"Martin", "familyName"=>"Fenner")
+      expect(subject.title).to eq("Maremma: a Ruby library for simplified network calls")
+      expect(subject.description["text"]).to start_with("Simplifies network calls")
       expect(subject.keywords).to eq("faraday, excon, net/http")
       expect(subject.date_created).to eq("2015-11-28")
       expect(subject.date_published).to eq("2017-02-24")
       expect(subject.date_modified).to eq("2017-02-24")
-      expect(subject.publisher).to eq("@type"=>"Organization", "name"=>"DataCite")
+      expect(subject.publisher).to eq("DataCite")
     end
 
     it "maremma schema.org JSON" do
       json = JSON.parse(subject.schema_org)
       expect(json["@id"]).to eq("https://doi.org/10.5438/qeg0-3gm3")
       expect(json["name"]).to eq("Maremma: a Ruby library for simplified network calls")
-      expect(json["author"]).to eq("@type"=>"person", "@id"=>"http://orcid.org/0000-0003-0077-4738", "name"=>"Martin Fenner")
+      expect(json["author"]).to eq("name"=>"Martin Fenner", "givenName"=>"Martin", "familyName"=>"Fenner", "@type"=>"Person", "@id"=>"http://orcid.org/0000-0003-0077-4738")
     end
 
     it "no codemeta.json" do
@@ -52,22 +52,25 @@ describe Bolognese::Codemeta, vcr: true do
       expect(subject.id).to eq("https://doi.org/10.5063/f1m61h5x")
       expect(subject.url).to eq("https://github.com/DataONEorg/rdataone")
       expect(subject.type).to eq("SoftwareSourceCode")
-      expect(subject.author).to eq([{"@type"=>"person",
-                                     "@id"=>"http://orcid.org/0000-0003-0077-4738",
-                                     "name"=>"Matt Jones"},
-                                    {"@type"=>"person",
-                                     "@id"=>"http://orcid.org/0000-0002-2192-403X",
-                                     "name"=>"Peter Slaughter"},
-                                    {"@type"=>"organization",
-                                     "name"=>"University of California, Santa Barbara"}])
-      expect(subject.name).to eq("R Interface to the DataONE REST API")
-      expect(subject.description).to start_with("Provides read and write access to data and metadata")
+      expect(subject.author).to eq( [{"type"=>"Person",
+                                      "id"=>"http://orcid.org/0000-0003-0077-4738",
+                                      "name"=>"Matt Jones",
+                                      "givenName"=>"Matt",
+                                      "familyName"=>"Jones"},
+                                     {"type"=>"Person",
+                                      "id"=>"http://orcid.org/0000-0002-2192-403X",
+                                      "name"=>"Peter Slaughter",
+                                      "givenName"=>"Peter",
+                                      "familyName"=>"Slaughter"},
+                                     {"type"=>"Organization", "name"=>"University Of California, Santa Barbara"}])
+      expect(subject.title).to eq("R Interface to the DataONE REST API")
+      expect(subject.description["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.version).to eq("2.0.0")
       expect(subject.date_created).to eq("2016-05-27")
       expect(subject.date_published).to eq("2016-05-27")
       expect(subject.date_modified).to eq("2016-05-27")
-      expect(subject.publisher).to eq("@type"=>"Organization", "name"=>"https://cran.r-project.org")
+      expect(subject.publisher).to eq("https://cran.r-project.org")
     end
 
     it "maremma" do
@@ -76,14 +79,14 @@ describe Bolognese::Codemeta, vcr: true do
       expect(subject.id).to eq("https://doi.org/10.5438/qeg0-3gm3")
       expect(subject.url).to eq("https://github.com/datacite/maremma")
       expect(subject.type).to eq("SoftwareSourceCode")
-      expect(subject.author).to eq("@id"=>"http://orcid.org/0000-0003-0077-4738", "@type"=>"person", "name"=>"Martin Fenner")
-      expect(subject.name).to eq("Maremma: a Ruby library for simplified network calls")
-      expect(subject.description).to start_with("Simplifies network calls")
+      expect(subject.author).to eq("type"=>"Person", "id"=>"http://orcid.org/0000-0003-0077-4738", "name"=>"Martin Fenner", "givenName"=>"Martin", "familyName"=>"Fenner")
+      expect(subject.title).to eq("Maremma: a Ruby library for simplified network calls")
+      expect(subject.description["text"]).to start_with("Simplifies network calls")
       expect(subject.keywords).to eq("faraday, excon, net/http")
       expect(subject.date_created).to eq("2015-11-28")
       expect(subject.date_published).to eq("2017-02-24")
       expect(subject.date_modified).to eq("2017-02-24")
-      expect(subject.publisher).to eq("@type"=>"Organization", "name"=>"DataCite")
+      expect(subject.publisher).to eq("DataCite")
     end
   end
 
@@ -94,23 +97,27 @@ describe Bolognese::Codemeta, vcr: true do
       datacite = Maremma.from_xml(subject.datacite).fetch("resource", {})
       expect(datacite.dig("titles", "title")).to eq("R Interface to the DataONE REST API")
       expect(datacite.dig("creators", "creator")).to eq([{"creatorName"=>"Matt Jones",
+                                                          "givenName"=>"Matt",
+                                                          "familyName"=>"Jones",
                                                           "nameIdentifier"=>
                                                          {"schemeURI"=>"http://orcid.org/",
                                                           "nameIdentifierScheme"=>"ORCID",
                                                           "__content__"=>"http://orcid.org/0000-0003-0077-4738"}},
                                                          {"creatorName"=>"Peter Slaughter",
+                                                           "givenName"=>"Peter",
+                                                           "familyName"=>"Slaughter",
                                                           "nameIdentifier"=>
                                                          {"schemeURI"=>"http://orcid.org/",
                                                           "nameIdentifierScheme"=>"ORCID",
                                                           "__content__"=>"http://orcid.org/0000-0002-2192-403X"}},
-                                                         {"creatorName"=>"University of California, Santa Barbara"}])
+                                                         {"creatorName"=>"University Of California, Santa Barbara"}])
       expect(datacite.fetch("version")).to eq("2.0.0")
     end
 
     it "maremma" do
       datacite = Maremma.from_xml(subject.datacite).fetch("resource", {})
       expect(datacite.dig("titles", "title")).to eq("Maremma: a Ruby library for simplified network calls")
-      expect(datacite.dig("creators", "creator")).to eq("creatorName"=>"Martin Fenner", "nameIdentifier"=>{"schemeURI"=>"http://orcid.org/", "nameIdentifierScheme"=>"ORCID", "__content__"=>"http://orcid.org/0000-0003-0077-4738"})
+      expect(datacite.dig("creators", "creator")).to eq("creatorName"=>"Martin Fenner", "givenName"=>"Martin", "familyName"=>"Fenner", "nameIdentifier"=>{"schemeURI"=>"http://orcid.org/", "nameIdentifierScheme"=>"ORCID", "__content__"=>"http://orcid.org/0000-0003-0077-4738"})
     end
   end
 
@@ -122,14 +129,17 @@ describe Bolognese::Codemeta, vcr: true do
       expect(json["@id"]).to eq("https://doi.org/10.5063/f1m61h5x")
       expect(json["@type"]).to eq("SoftwareSourceCode")
       expect(json["name"]).to eq("R Interface to the DataONE REST API")
-      expect(json["author"]).to eq([{"@type"=>"person",
-                                     "@id"=>"http://orcid.org/0000-0003-0077-4738",
-                                     "name"=>"Matt Jones"},
-                                    {"@type"=>"person",
-                                     "@id"=>"http://orcid.org/0000-0002-2192-403X",
-                                     "name"=>"Peter Slaughter"},
-                                    {"@type"=>"organization",
-                                     "name"=>"University of California, Santa Barbara"}])
+      expect(json["author"]).to eq([{"name"=>"Matt Jones",
+                                     "givenName"=>"Matt",
+                                     "familyName"=>"Jones",
+                                     "@type"=>"Person",
+                                     "@id"=>"http://orcid.org/0000-0003-0077-4738"},
+                                    {"name"=>"Peter Slaughter",
+                                     "givenName"=>"Peter",
+                                     "familyName"=>"Slaughter",
+                                     "@type"=>"Person",
+                                     "@id"=>"http://orcid.org/0000-0002-2192-403X"},
+                                    {"name"=>"University Of California, Santa Barbara", "@type"=>"Organization"}])
       expect(json["version"]).to eq("2.0.0")
     end
 
@@ -138,7 +148,7 @@ describe Bolognese::Codemeta, vcr: true do
       expect(json["@id"]).to eq("https://doi.org/10.5438/qeg0-3gm3")
       expect(json["@type"]).to eq("SoftwareSourceCode")
       expect(json["name"]).to eq("Maremma: a Ruby library for simplified network calls")
-      expect(json["author"]).to eq("@type"=>"person", "@id"=>"http://orcid.org/0000-0003-0077-4738", "name"=>"Martin Fenner")
+      expect(json["author"]).to eq("name"=>"Martin Fenner", "givenName"=>"Martin", "familyName"=>"Fenner", "@type"=>"Person", "@id"=>"http://orcid.org/0000-0003-0077-4738")
     end
   end
 

data/spec/crossref_spec.rb

@@ -12,29 +12,23 @@ describe Bolognese::Crossref, vcr: true do
       expect(subject.url).to eq("http://elifesciences.org/lookup/doi/10.7554/eLife.01567")
       expect(subject.additional_type).to eq("JournalArticle")
       expect(subject.resource_type_general).to eq("Text")
-      expect(subject.author).to eq([{"@type"=>"Person", "givenName"=>"Martial", "familyName"=>"Sankar"},
-                                    {"@type"=>"Person", "givenName"=>"Kaisa", "familyName"=>"Nieminen"},
-                                    {"@type"=>"Person", "givenName"=>"Laura", "familyName"=>"Ragni"},
-                                    {"@type"=>"Person", "givenName"=>"Ioannis", "familyName"=>"Xenarios"},
-                                    {"@type"=>"Person", "givenName"=>"Christian S", "familyName"=>"Hardtke"}])
+      expect(subject.author.length).to eq(5)
+      expect(subject.author.first).to eq("type"=>"Person", "name"=>"Martial Sankar", "givenName"=>"Martial", "familyName"=>"Sankar")
       expect(subject.license).to eq("http://creativecommons.org/licenses/by/3.0/")
-      expect(subject.name).to eq("Automated quantitative histology reveals vascular morphodynamics during Arabidopsis hypocotyl secondary growth")
+      expect(subject.title).to eq("Automated quantitative histology reveals vascular morphodynamics during Arabidopsis hypocotyl secondary growth")
       expect(subject.date_published).to eq("2014-02-11")
       expect(subject.date_modified).to eq("2015-08-11T05:35:02Z")
-      expect(subject.is_part_of).to eq("@type"=>"Periodical", "name"=>"eLife", "issn"=>"2050-084X")
-      expect(subject.citation.count).to eq(27)
-      expect(subject.citation[21]).to eq("@type"=>"CreativeWork", "@id"=>"https://doi.org/10.5061/dryad.b835k", "position"=>"22", "datePublished"=>"2014")
-      expect(subject.funder).to eq([{"@type"=>"Organization", "name"=>"SystemsX"},
-                                    {"@type"=>"Organization",
-                                     "@id"=>"https://doi.org/10.13039/501100003043",
+      expect(subject.is_part_of).to eq("type"=>"Periodical", "name"=>"eLife", "issn"=>"2050-084X")
+      expect(subject.references.count).to eq(27)
+      expect(subject.references[21]).to eq("id"=>"https://doi.org/10.5061/dryad.b835k", "relationType"=>"Cites", "position"=>"22", "datePublished"=>"2014")
+      expect(subject.funder).to eq([{"name"=>"SystemsX"},
+                                    {"id"=>"https://doi.org/10.13039/501100003043",
                                      "name"=>"EMBO"},
-                                    {"@type"=>"Organization",
-                                     "@id"=>"https://doi.org/10.13039/501100001711",
+                                    {"id"=>"https://doi.org/10.13039/501100001711",
                                      "name"=>"Swiss National Science Foundation"},
-                                    {"@type"=>"Organization",
-                                     "@id"=>"https://doi.org/10.13039/501100006390",
+                                    {"id"=>"https://doi.org/10.13039/501100006390",
                                      "name"=>"University of Lausanne"}])
-      expect(subject.provider).to eq("@type"=>"Organization", "name"=>"Crossref")
+      expect(subject.provider).to eq("Crossref")
     end
 
     it "journal article" do
@@ -45,19 +39,16 @@ describe Bolognese::Crossref, vcr: true do
       expect(subject.type).to eq("ScholarlyArticle")
       expect(subject.additional_type).to eq("JournalArticle")
       expect(subject.resource_type_general).to eq("Text")
-      expect(subject.author).to eq([{"@type"=>"Person", "givenName"=>"Markus", "familyName"=>"Ralser"},
-                                    {"@type"=>"Person", "givenName"=>"Gino", "familyName"=>"Heeren"},
-                                    {"@type"=>"Person", "givenName"=>"Michael", "familyName"=>"Breitenbach"},
-                                    {"@type"=>"Person", "givenName"=>"Hans", "familyName"=>"Lehrach"},
-                                    {"@type"=>"Person", "givenName"=>"Sylvia", "familyName"=>"Krobitsch"}])
-      expect(subject.editor).to eq("@type"=>"Person", "givenName"=>"Guilhem", "familyName"=>"Janbon")
-      expect(subject.name).to eq("Triose Phosphate Isomerase Deficiency Is Caused by Altered Dimerization–Not Catalytic Inactivity–of the Mutant Enzymes")
+      expect(subject.author.length).to eq(5)
+      expect(subject.author.first).to eq("type"=>"Person", "name"=>"Markus Ralser", "givenName"=>"Markus", "familyName"=>"Ralser")
+      expect(subject.editor).to eq("type"=>"Person", "name"=>"Guilhem Janbon", "givenName"=>"Guilhem", "familyName"=>"Janbon")
+      expect(subject.title).to eq("Triose Phosphate Isomerase Deficiency Is Caused by Altered Dimerization–Not Catalytic Inactivity–of the Mutant Enzymes")
       expect(subject.license).to eq("http://creativecommons.org/licenses/by/4.0/")
       expect(subject.date_published).to eq("2006-12-20")
       expect(subject.date_modified).to eq("2016-12-31T21:37:08Z")
       expect(subject.page_start).to eq("e30")
-      expect(subject.is_part_of).to eq("@type"=>"Periodical", "name"=>"PLoS ONE", "issn"=>"1932-6203")
-      expect(subject.provider).to eq("@type"=>"Organization", "name"=>"Crossref")
+      expect(subject.is_part_of).to eq("type"=>"Periodical", "name"=>"PLoS ONE", "issn"=>"1932-6203")
+      expect(subject.provider).to eq("Crossref")
     end
 
     it "posted_content" do
@@ -69,14 +60,14 @@ describe Bolognese::Crossref, vcr: true do
       expect(subject.additional_type).to eq("PostedContent")
       expect(subject.resource_type_general).to eq("Text")
       expect(subject.author.count).to eq(10)
-      expect(subject.author.last).to eq("@type"=>"Person", "@id"=>"http://orcid.org/0000-0003-4060-7360", "givenName"=>"Timothy", "familyName"=>"Clark")
-      expect(subject.name).to eq("A Data Citation Roadmap for Scholarly Data Repositories")
+      expect(subject.author.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("A Data Citation Roadmap for Scholarly Data Repositories")
       expect(subject.alternate_name).to eq("biorxiv;097196v1")
       expect(subject.description).to start_with("This article presents a practical roadmap")
       expect(subject.date_published).to eq("2016-12-28")
       expect(subject.date_modified).to eq("2016-12-29T00:10:20Z")
       expect(subject.is_part_of).to be_nil
-      expect(subject.provider).to eq("@type"=>"Organization", "name"=>"Crossref")
+      expect(subject.provider).to eq("Crossref")
     end
 
     it "DOI with SICI DOI" do
@@ -87,15 +78,15 @@ describe Bolognese::Crossref, vcr: true do
       expect(subject.type).to eq("ScholarlyArticle")
       expect(subject.additional_type).to eq("JournalArticle")
       expect(subject.resource_type_general).to eq("Text")
-      expect(subject.author).to eq([{"@type"=>"Person", "givenName"=>"A.", "familyName"=>"Fenton"}, {"@type"=>"Person", "givenName"=>"S. A.", "familyName"=>"Rands"}])
+      expect(subject.author).to eq([{"type"=>"Person", "name"=>"A. Fenton", "givenName"=>"A.", "familyName"=>"Fenton"}, {"type"=>"Person", "name"=>"S. A. Rands", "givenName"=>"S. A.", "familyName"=>"Rands"}])
       expect(subject.license).to eq("http://doi.wiley.com/10.1002/tdm_license_1")
-      expect(subject.name).to eq("THE IMPACT OF PARASITE MANIPULATION AND PREDATOR FORAGING BEHAVIOR ON PREDATOR–PREY COMMUNITIES")
+      expect(subject.title).to eq("THE IMPACT OF PARASITE MANIPULATION AND PREDATOR FORAGING BEHAVIOR ON PREDATOR–PREY COMMUNITIES")
       expect(subject.date_published).to eq("2006-11")
       expect(subject.date_modified).to eq("2016-10-04T17:20:17Z")
       expect(subject.page_start).to eq("2832")
       expect(subject.page_end).to eq("2841")
-      expect(subject.is_part_of).to eq("@type"=>"Periodical", "name"=>"Ecology", "issn"=>"0012-9658")
-      expect(subject.provider).to eq("@type"=>"Organization", "name"=>"Crossref")
+      expect(subject.is_part_of).to eq("type"=>"Periodical", "name"=>"Ecology", "issn"=>"0012-9658")
+      expect(subject.provider).to eq("Crossref")
     end
 
     it "DOI with ORCID ID" do
@@ -106,24 +97,16 @@ describe Bolognese::Crossref, vcr: true do
       expect(subject.type).to eq("ScholarlyArticle")
       expect(subject.additional_type).to eq("JournalArticle")
       expect(subject.resource_type_general).to eq("Text")
-      expect(subject.author).to eq([{"@type"=>"Person", "givenName"=>"Wendy", "familyName"=>"Thanassi"},
-                                    {"@type"=>"Person", "givenName"=>"Art", "familyName"=>"Noda"},
-                                    {"@type"=>"Person",
-                                     "@id"=>"http://orcid.org/0000-0003-2043-4925",
-                                     "givenName"=>"Beatriz",
-                                     "familyName"=>"Hernandez"},
-                                    {"@type"=>"Person", "givenName"=>"Jeffery", "familyName"=>"Newell"},
-                                    {"@type"=>"Person", "givenName"=>"Paul", "familyName"=>"Terpeluk"},
-                                    {"@type"=>"Person", "givenName"=>"David", "familyName"=>"Marder"},
-                                    {"@type"=>"Person", "givenName"=>"Jerome A.", "familyName"=>"Yesavage"}])
+      expect(subject.author.length).to eq(7)
+      expect(subject.author[2]).to eq("type"=>"Person", "id"=>"http://orcid.org/0000-0003-2043-4925", "name"=>"Beatriz Hernandez", "givenName"=>"Beatriz", "familyName"=>"Hernandez")
       expect(subject.license).to eq("http://creativecommons.org/licenses/by/3.0/")
-      expect(subject.name).to eq("Delineating a Retesting Zone Using Receiver Operating Characteristic Analysis on Serial QuantiFERON Tuberculosis Test Results in US Healthcare Workers")
+      expect(subject.title).to eq("Delineating a Retesting Zone Using Receiver Operating Characteristic Analysis on Serial QuantiFERON Tuberculosis Test Results in US Healthcare Workers")
       expect(subject.date_published).to eq("2012")
       expect(subject.date_modified).to eq("2016-08-02T12:42:41Z")
       expect(subject.page_start).to eq("1")
       expect(subject.page_end).to eq("7")
-      expect(subject.is_part_of).to eq("@type"=>"Periodical", "name"=>"Pulmonary Medicine", "issn"=>["2090-1836", "2090-1844"])
-      expect(subject.provider).to eq("@type"=>"Organization", "name"=>"Crossref")
+      expect(subject.is_part_of).to eq("type"=>"Periodical", "name"=>"Pulmonary Medicine", "issn"=>["2090-1836", "2090-1844"])
+      expect(subject.provider).to eq("Crossref")
     end
 
     it "date in future" do
@@ -134,21 +117,13 @@ describe Bolognese::Crossref, vcr: true do
       expect(subject.type).to eq("ScholarlyArticle")
       expect(subject.additional_type).to eq("JournalArticle")
       expect(subject.resource_type_general).to eq("Text")
-      expect(subject.author).to eq([{"@type"=>"Person", "givenName"=>"Sarah E.", "familyName"=>"Beck"},
-                                    {"@type"=>"Person", "givenName"=>"Suzanne E.", "familyName"=>"Queen"},
-                                    {"@type"=>"Person", "givenName"=>"Kenneth W.", "familyName"=>"Witwer"},
-                                    {"@type"=>"Person", "givenName"=>"Kelly A.", "familyName"=>"Metcalf Pate"},
-                                    {"@type"=>"Person", "givenName"=>"Lisa M.", "familyName"=>"Mangus"},
-                                    {"@type"=>"Person", "givenName"=>"Lucio", "familyName"=>"Gama"},
-                                    {"@type"=>"Person", "givenName"=>"Robert J.", "familyName"=>"Adams"},
-                                    {"@type"=>"Person", "givenName"=>"Janice E.", "familyName"=>"Clements"},
-                                    {"@type"=>"Person", "givenName"=>"M.", "familyName"=>"Christine Zink"},
-                                    {"@type"=>"Person", "givenName"=>"Joseph L.", "familyName"=>"Mankowski"}])
-      expect(subject.name).to eq("Paving the path to HIV neurotherapy: Predicting SIV CNS disease")
+      expect(subject.author.length).to eq(10)
+      expect(subject.author.first).to eq("type"=>"Person", "name"=>"Sarah E. Beck", "givenName"=>"Sarah E.", "familyName"=>"Beck")
+      expect(subject.title).to eq("Paving the path to HIV neurotherapy: Predicting SIV CNS disease")
       expect(subject.date_published).to eq("2015-07")
       expect(subject.date_modified).to eq("2016-08-20T02:19:38Z")
-      expect(subject.is_part_of).to eq("@type"=>"Periodical", "name"=>"European Journal of Pharmacology", "issn"=>"00142999")
-      expect(subject.provider).to eq("@type"=>"Organization", "name"=>"Crossref")
+      expect(subject.is_part_of).to eq("type"=>"Periodical", "name"=>"European Journal of Pharmacology", "issn"=>"00142999")
+      expect(subject.provider).to eq("Crossref")
     end
 
     it "not found error" do
@@ -175,19 +150,16 @@ describe Bolognese::Crossref, vcr: true do
       expect(subject.type).to eq("ScholarlyArticle")
       expect(subject.additional_type).to eq("JournalArticle")
       expect(subject.resource_type_general).to eq("Text")
-      expect(subject.author).to eq([{"@type"=>"Person", "givenName"=>"Martial", "familyName"=>"Sankar"},
-                                    {"@type"=>"Person", "givenName"=>"Kaisa", "familyName"=>"Nieminen"},
-                                    {"@type"=>"Person", "givenName"=>"Laura", "familyName"=>"Ragni"},
-                                    {"@type"=>"Person", "givenName"=>"Ioannis", "familyName"=>"Xenarios"},
-                                    {"@type"=>"Person", "givenName"=>"Christian S", "familyName"=>"Hardtke"}])
+      expect(subject.author.length).to eq(5)
+      expect(subject.author.last).to eq("type"=>"Person", "name"=>"Christian S Hardtke", "givenName"=>"Christian S", "familyName"=>"Hardtke")
       expect(subject.license).to eq("http://creativecommons.org/licenses/by/3.0/")
-      expect(subject.name).to eq("Automated quantitative histology reveals vascular morphodynamics during Arabidopsis hypocotyl secondary growth")
+      expect(subject.title).to eq("Automated quantitative histology reveals vascular morphodynamics during Arabidopsis hypocotyl secondary growth")
       expect(subject.date_published).to eq("2014-02-11")
       expect(subject.date_modified).to eq("2015-08-11T05:35:02Z")
-      expect(subject.is_part_of).to eq("@type"=>"Periodical", "name"=>"eLife", "issn"=>"2050-084X")
-      expect(subject.citation.count).to eq(27)
-      expect(subject.citation[21]).to eq("@type"=>"CreativeWork", "@id"=>"https://doi.org/10.5061/dryad.b835k", "position"=>"22", "datePublished"=>"2014")
-      expect(subject.provider).to eq("@type"=>"Organization", "name"=>"Crossref")
+      expect(subject.is_part_of).to eq("type"=>"Periodical", "name"=>"eLife", "issn"=>"2050-084X")
+      expect(subject.references.count).to eq(27)
+      expect(subject.references[21]).to eq("id"=>"https://doi.org/10.5061/dryad.b835k", "relationType"=>"Cites", "position"=>"22", "datePublished"=>"2014")
+      expect(subject.provider).to eq("Crossref")
     end
   end
 
@@ -196,7 +168,7 @@ describe Bolognese::Crossref, vcr: true do
       datacite = Maremma.from_xml(subject.datacite).fetch("resource", {})
       expect(datacite.dig("resourceType", "resourceTypeGeneral")).to eq("Text")
       expect(datacite.dig("titles", "title")).to eq("Automated quantitative histology reveals vascular morphodynamics during Arabidopsis hypocotyl secondary growth")
-      expect(datacite.dig("relatedIdentifiers", "relatedIdentifier").count).to eq(25)
+      expect(datacite.dig("relatedIdentifiers", "relatedIdentifier").count).to eq(27)
       expect(datacite.dig("fundingReferences", "fundingReference").count).to eq(4)
       expect(datacite.dig("fundingReferences", "fundingReference").last).to eq("funderName"=>"University of Lausanne", "funderIdentifier"=>{"funderIdentifierType"=>"Crossref Funder ID", "__content__"=>"https://doi.org/10.13039/501100006390"})
     end
@@ -207,14 +179,17 @@ describe Bolognese::Crossref, vcr: true do
       datacite = Maremma.from_xml(subject.datacite).fetch("resource", {})
       expect(datacite.dig("resourceType", "resourceTypeGeneral")).to eq("Text")
       expect(datacite.dig("creators", "creator").count).to eq(7)
-      expect(datacite.dig("creators", "creator").first).to eq("creatorName"=>"Thanassi, Wendy", "givenName"=>"Wendy", "familyName"=>"Thanassi")
+      expect(datacite.dig("creators", "creator")[2]).to eq("creatorName" => "Beatriz Hernandez",
+       +"familyName" => "Hernandez",
+       +"givenName" => "Beatriz",
+        "nameIdentifier" => {"schemeURI"=>"http://orcid.org/", "nameIdentifierScheme"=>"ORCID", "__content__"=>"http://orcid.org/0000-0003-2043-4925"})
     end
 
     it "with editor" do
       id = "https://doi.org/10.1371/journal.pone.0000030"
       subject = Bolognese::Crossref.new(id: id)
       datacite = Maremma.from_xml(subject.datacite).fetch("resource", {})
-      expect(datacite.dig("contributors", "contributor")).to eq("contributorType"=>"Editor", "contributorName"=>"Janbon, Guilhem", "givenName"=>"Guilhem", "familyName"=>"Janbon")
+      expect(datacite.dig("contributors", "contributor")).to eq("contributorType"=>"Editor", "contributorName"=>"Guilhem Janbon", "givenName"=>"Guilhem", "familyName"=>"Janbon")
     end
   end