bolognese 1.2.5 → 1.2.6
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile.lock +2 -2
- data/lib/bolognese/readers/crossref_reader.rb +11 -1
- data/lib/bolognese/utils.rb +2 -1
- data/lib/bolognese/version.rb +1 -1
- data/spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_crossref_metadata/markup.yml +92 -0
- data/spec/readers/crossref_reader_spec.rb +17 -1
- data/spec/readers/datacite_reader_spec.rb +1 -1
- data/spec/writers/datacite_writer_spec.rb +1 -1
- data/spec/writers/schema_org_writer_spec.rb +1 -1
- metadata +3 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 21912ef15204e732d0b6e9cefb47cbfe70510d53c16177d3005e1540b4e4e6aa
|
4
|
+
data.tar.gz: 595b2916bb624e12ea096f8a1710b3b47c289f9ee348915f005dcd8889a0dbd0
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 04c7d19a9b7745b8abbb43ebafaa4bb6c7b2dab86fae78ceb41cece09c75c2650c31fcbb4dbcd2df94d8e6c3bbc5ce2f78c54c639b5e3ef1d5354e280463cc95
|
7
|
+
data.tar.gz: 4dfdd798411aac2630fb82fa9741b809044c6962c52a4acacaaa985dcc398278459d0bb4e27879483bd4f27d8a8a7ccba268b81a1e907b6ca737a0dbd349e077
|
data/Gemfile.lock
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
PATH
|
2
2
|
remote: .
|
3
3
|
specs:
|
4
|
-
bolognese (1.2.
|
4
|
+
bolognese (1.2.6)
|
5
5
|
activesupport (>= 4.2.5, < 6)
|
6
6
|
benchmark_methods (~> 0.7)
|
7
7
|
bibtex-ruby (~> 4.1)
|
@@ -97,7 +97,7 @@ GEM
|
|
97
97
|
loofah (2.2.3)
|
98
98
|
crass (~> 1.0.2)
|
99
99
|
nokogiri (>= 1.5.9)
|
100
|
-
maremma (4.2.
|
100
|
+
maremma (4.2.6)
|
101
101
|
activesupport (>= 4.2.5, < 6)
|
102
102
|
addressable (>= 2.3.6)
|
103
103
|
builder (~> 3.2, >= 3.2.2)
|
@@ -85,6 +85,16 @@ module Bolognese
|
|
85
85
|
"ris" => Bolognese::Utils::CR_TO_RIS_TRANSLATIONS[resource_type] || "JOUR"
|
86
86
|
}.compact
|
87
87
|
|
88
|
+
titles = Array.wrap(bibliographic_metadata.dig("titles")).map do |r|
|
89
|
+
if r.blank? || r["title"].blank?
|
90
|
+
nil
|
91
|
+
elsif r["title"].is_a?(String)
|
92
|
+
{ "title" => sanitize(r["title"]) }
|
93
|
+
else
|
94
|
+
{ "title" => sanitize(r.dig("title", "__content__")) }.compact
|
95
|
+
end
|
96
|
+
end.compact
|
97
|
+
|
88
98
|
date_updated = Array.wrap(query.to_h["crm_item"]).find { |cr| cr["name"] == "last-update" }
|
89
99
|
date_updated = { "date" => date_updated.fetch("__content__", nil), "dateType" => "Updated" } if date_updated.present?
|
90
100
|
dates = [
|
@@ -118,7 +128,7 @@ module Bolognese
|
|
118
128
|
"types" => types,
|
119
129
|
"doi" => doi_from_url(doi),
|
120
130
|
"url" => parse_attributes(bibliographic_metadata.dig("doi_data", "resource"), first: true),
|
121
|
-
"titles" =>
|
131
|
+
"titles" => titles,
|
122
132
|
"identifiers" => identifiers,
|
123
133
|
"creators" => crossref_people(bibliographic_metadata, "author"),
|
124
134
|
"contributors" => crossref_people(bibliographic_metadata, "editor"),
|
data/lib/bolognese/utils.rb
CHANGED
@@ -751,7 +751,8 @@ module Bolognese
|
|
751
751
|
custom_scrubber = Bolognese::WhitelistScrubber.new(options)
|
752
752
|
|
753
753
|
if text.is_a?(String)
|
754
|
-
|
754
|
+
# remove excessive internal whitespace with squish
|
755
|
+
Loofah.scrub_fragment(text, custom_scrubber).to_s.squish
|
755
756
|
elsif text.is_a?(Hash)
|
756
757
|
sanitize(text.fetch(content, nil))
|
757
758
|
elsif text.is_a?(Array)
|
data/lib/bolognese/version.rb
CHANGED
@@ -0,0 +1,92 @@
|
|
1
|
+
---
|
2
|
+
http_interactions:
|
3
|
+
- request:
|
4
|
+
method: get
|
5
|
+
uri: https://doi.org/ra/10.1098
|
6
|
+
body:
|
7
|
+
encoding: US-ASCII
|
8
|
+
string: ''
|
9
|
+
headers:
|
10
|
+
User-Agent:
|
11
|
+
- Mozilla/5.0 (compatible; Maremma/4.2.3; mailto:info@datacite.org)
|
12
|
+
Accept:
|
13
|
+
- text/html,application/json,application/xml;q=0.9, text/plain;q=0.8,image/png,*/*;q=0.5
|
14
|
+
response:
|
15
|
+
status:
|
16
|
+
code: 200
|
17
|
+
message: ''
|
18
|
+
headers:
|
19
|
+
Date:
|
20
|
+
- Sat, 06 Jul 2019 06:15:00 GMT
|
21
|
+
Content-Type:
|
22
|
+
- application/json;charset=UTF-8
|
23
|
+
Content-Length:
|
24
|
+
- '54'
|
25
|
+
Connection:
|
26
|
+
- keep-alive
|
27
|
+
Set-Cookie:
|
28
|
+
- __cfduid=d15594089053c0b13b578ee19282bc8b51562393700; expires=Sun, 05-Jul-20
|
29
|
+
06:15:00 GMT; path=/; domain=.doi.org; HttpOnly
|
30
|
+
Expect-Ct:
|
31
|
+
- max-age=604800, report-uri="https://report-uri.cloudflare.com/cdn-cgi/beacon/expect-ct"
|
32
|
+
Server:
|
33
|
+
- cloudflare
|
34
|
+
Cf-Ray:
|
35
|
+
- 4f1f7116ed88d6dd-FRA
|
36
|
+
body:
|
37
|
+
encoding: ASCII-8BIT
|
38
|
+
string: |-
|
39
|
+
[
|
40
|
+
{
|
41
|
+
"DOI": "10.1098",
|
42
|
+
"RA": "Crossref"
|
43
|
+
}
|
44
|
+
]
|
45
|
+
http_version:
|
46
|
+
recorded_at: Sat, 06 Jul 2019 06:15:00 GMT
|
47
|
+
- request:
|
48
|
+
method: get
|
49
|
+
uri: https://api.crossref.org/works/10.1098/rspb.2017.0132/transform/application/vnd.crossref.unixsd+xml
|
50
|
+
body:
|
51
|
+
encoding: US-ASCII
|
52
|
+
string: ''
|
53
|
+
headers:
|
54
|
+
User-Agent:
|
55
|
+
- Mozilla/5.0 (compatible; Maremma/4.2.3; mailto:info@datacite.org)
|
56
|
+
Accept:
|
57
|
+
- text/xml
|
58
|
+
response:
|
59
|
+
status:
|
60
|
+
code: 200
|
61
|
+
message: OK
|
62
|
+
headers:
|
63
|
+
Link:
|
64
|
+
- <http://dx.doi.org/10.1098/rspb.2017.0132>; rel="canonical", <https://syndication.highwire.org/content/doi/10.1098/rspb.2017.0132>;
|
65
|
+
version="vor"; rel="item", <http://royalsocietypublishing.org/licence>; version="vor";
|
66
|
+
rel="license", <http://orcid.org/0000-0003-1406-0680>; title="Liam R. Dougherty";
|
67
|
+
rel="author", <http://orcid.org/0000-0001-6072-3807>; title="Kathryn B. McNamara";
|
68
|
+
rel="author", <http://orcid.org/0000-0003-0562-1474>; title="Leigh W. Simmons";
|
69
|
+
rel="author"
|
70
|
+
Access-Control-Allow-Origin:
|
71
|
+
- "*"
|
72
|
+
Access-Control-Allow-Headers:
|
73
|
+
- X-Requested-With
|
74
|
+
Content-Length:
|
75
|
+
- '20282'
|
76
|
+
Server:
|
77
|
+
- http-kit
|
78
|
+
Date:
|
79
|
+
- Sat, 06 Jul 2019 06:15:01 GMT
|
80
|
+
X-Rate-Limit-Limit:
|
81
|
+
- '50'
|
82
|
+
X-Rate-Limit-Interval:
|
83
|
+
- 1s
|
84
|
+
Connection:
|
85
|
+
- close
|
86
|
+
body:
|
87
|
+
encoding: ASCII-8BIT
|
88
|
+
string: !binary |-
|
89
|
+
<?xml version="1.0" encoding="UTF-8"?>
<crossref_result xmlns="http://www.crossref.org/qrschema/3.0" version="3.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.crossref.org/qrschema/3.0 http://www.crossref.org/schemas/crossref_query_output3.0.xsd">
  <query_result>
    <head>
      <doi_batch_id>none</doi_batch_id>
    </head>
    <body>
      <query status="resolved">
        <doi type="journal_article">10.1098/rspb.2017.0132</doi>
        <crm-item name="publisher-name" type="string">The Royal Society</crm-item>
        <crm-item name="prefix-name" type="string">The Royal Society</crm-item>
        <crm-item name="member-id" type="number">175</crm-item>
        <crm-item name="citation-id" type="number">90341029</crm-item>
        <crm-item name="journal-id" type="number">5192</crm-item>
        <crm-item name="deposit-timestamp" type="number">2017052402101815000</crm-item>
        <crm-item name="owner-prefix" type="string">10.1098</crm-item>
        <crm-item name="last-update" type="date">2017-05-24T09:13:39Z</crm-item>
        <crm-item name="created" type="date">2017-05-24T09:10:21Z</crm-item>
        <crm-item name="citedby-count" type="number">16</crm-item>
        <doi_record>
          <crossref xmlns="http://www.crossref.org/xschema/1.1" xsi:schemaLocation="http://www.crossref.org/xschema/1.1 http://doi.crossref.org/schemas/unixref1.1.xsd">
            <journal>
              <journal_metadata language="en">
                <full_title>Proceedings of the Royal Society B: Biological Sciences</full_title>
                <abbrev_title>Proc. R. Soc. B</abbrev_title>
                <issn media_type="print">0962-8452</issn>
                <issn media_type="electronic">1471-2954</issn>
              </journal_metadata>
              <journal_issue>
                <publication_date media_type="online">
                  <month>05</month>
                  <day>24</day>
                  <year>2017</year>
                </publication_date>
                <publication_date media_type="print">
                  <month>05</month>
                  <day>31</day>
                  <year>2017</year>
                </publication_date>
                <journal_volume>
                  <volume>284</volume>
                </journal_volume>
                <issue>1855</issue>
              </journal_issue>
              <journal_article publication_type="full_text">
                <titles>
                  <title>
                    Sexual conflict and correlated evolution between male persistence and female resistance traits in the seed beetle
                    <i>Callosobruchus maculatus</i>
                  </title>
                </titles>
                <contributors>
                  <person_name contributor_role="author" sequence="first">
                    <given_name>Liam R.</given_name>
                    <surname>Dougherty</surname>
                    <ORCID>http://orcid.org/0000-0003-1406-0680</ORCID>
                  </person_name>
                  <person_name contributor_role="author" sequence="additional">
                    <given_name>Emile</given_name>
                    <surname>van Lieshout</surname>
                  </person_name>
                  <person_name contributor_role="author" sequence="additional">
                    <given_name>Kathryn B.</given_name>
                    <surname>McNamara</surname>
                    <ORCID>http://orcid.org/0000-0001-6072-3807</ORCID>
                  </person_name>
                  <person_name contributor_role="author" sequence="additional">
                    <given_name>Joe A.</given_name>
                    <surname>Moschilla</surname>
                  </person_name>
                  <person_name contributor_role="author" sequence="additional">
                    <given_name>Göran</given_name>
                    <surname>Arnqvist</surname>
                  </person_name>
                  <person_name contributor_role="author" sequence="additional">
                    <given_name>Leigh W.</given_name>
                    <surname>Simmons</surname>
                    <ORCID>http://orcid.org/0000-0003-0562-1474</ORCID>
                  </person_name>
                </contributors>
                <publication_date media_type="online">
                  <month>05</month>
                  <day>24</day>
                  <year>2017</year>
                </publication_date>
                <publication_date media_type="print">
                  <month>05</month>
                  <day>31</day>
                  <year>2017</year>
                </publication_date>
                <pages>
                  <first_page>20170132</first_page>
                </pages>
                <publisher_item>
                  <item_number item_number_type="atom">/royprsb/284/1855/20170132.atom</item_number>
                  <identifier id_type="doi">10.1098/rspb.2017.0132</identifier>
                </publisher_item>
                <crossmark>
                  <crossmark_version>1.0</crossmark_version>
                  <crossmark_policy>10.1098/crossmarkpolicy</crossmark_policy>
                  <crossmark_domains>
                    <crossmark_domain>
                      <domain>royalsocietypublishing.org</domain>
                    </crossmark_domain>
                  </crossmark_domains>
                  <crossmark_domain_exclusive>true</crossmark_domain_exclusive>
                  <custom_metadata>
                    <fr:program xmlns:fr="http://www.crossref.org/fundref.xsd" name="fundref">
                      <fr:assertion name="fundgroup">
                        <fr:assertion name="funder_name">
                          H2020 European Research Council
                          <fr:assertion name="funder_identifier">http://dx.doi.org/10.13039/100010663</fr:assertion>
                        </fr:assertion>
                        <fr:assertion name="award_number">GENCON AdG-294333</fr:assertion>
                      </fr:assertion>
                      <fr:assertion name="fundgroup">
                        <fr:assertion name="funder_name">
                          Vetenskapsrådet
                          <fr:assertion name="funder_identifier">http://dx.doi.org/10.13039/501100004359</fr:assertion>
                        </fr:assertion>
                        <fr:assertion name="award_number">621-2014-4523</fr:assertion>
                      </fr:assertion>
                      <fr:assertion name="fundgroup">
                        <fr:assertion name="funder_name">UWA Research Collaboration Award</fr:assertion>
                      </fr:assertion>
                      <fr:assertion name="fundgroup">
                        <fr:assertion name="funder_name">
                          Australian Research Council
                          <fr:assertion name="funder_identifier">http://dx.doi.org/10.13039/501100000923</fr:assertion>
                        </fr:assertion>
                        <fr:assertion name="award_number">DE-160100097</fr:assertion>
                        <fr:assertion name="award_number">DP-110101163</fr:assertion>
                        <fr:assertion name="award_number">DP-130100618</fr:assertion>
                      </fr:assertion>
                    </fr:program>
                    <ai:program xmlns:ai="http://www.crossref.org/AccessIndicators.xsd" name="AccessIndicators">
                      <ai:license_ref applies_to="vor">http://royalsocietypublishing.org/licence</ai:license_ref>
                    </ai:program>
                  </custom_metadata>
                </crossmark>
                <doi_data>
                  <doi>10.1098/rspb.2017.0132</doi>
                  <timestamp>2017052402101815000</timestamp>
                  <resource>http://rspb.royalsocietypublishing.org/lookup/doi/10.1098/rspb.2017.0132</resource>
                  <collection property="crawler-based">
                    <item crawler="iParadigms">
                      <resource>https://syndication.highwire.org/content/doi/10.1098/rspb.2017.0132</resource>
                    </item>
                  </collection>
                </doi_data>
                <citation_list>
                  <citation key="2017052402101815000_284.1855.20170132.1">
                    <doi provider="crossref">10.1016/B978-0-12-108750-0.50010-0</doi>
                    <unstructured_citation>Parker G . 1979 Sexual selection and sexual conflict. In Sexual selection and reproductive competition in insects (eds M Blum , N Blum ), pp. 123–166. New York, NY: Academic Press.</unstructured_citation>
                  </citation>
                  <citation key="2017052402101815000_284.1855.20170132.2">
                    <doi provider="crossref">10.1515/9781400850600</doi>
                    <unstructured_citation>Arnqvist G , Rowe L . 2005 Sexual conflict. Princeton, NJ: Princeton University Press.</unstructured_citation>
                  </citation>
                  <citation key="2017052402101815000_284.1855.20170132.3">
                    <doi>10.1111/brv.12018</doi>
                  </citation>
                  <citation key="2017052402101815000_284.1855.20170132.4">
                    <doi>10.1038/35038154</doi>
                  </citation>
                  <citation key="2017052402101815000_284.1855.20170132.5">
                    <doi>10.1093/beheco/13.3.353</doi>
                  </citation>
                  <citation key="2017052402101815000_284.1855.20170132.6">
                    <doi>10.1007/s00435-010-0109-5</doi>
                  </citation>
                  <citation key="2017052402101815000_284.1855.20170132.7">
                    <doi>10.1007/s00265-012-1361-0</doi>
                  </citation>
                  <citation key="2017052402101815000_284.1855.20170132.8">
                    <doi>10.1086/429356</doi>
                  </citation>
                  <citation key="2017052402101815000_284.1855.20170132.9">
                    <doi>10.1086/303392</doi>
                  </citation>
                  <citation key="2017052402101815000_284.1855.20170132.10">
                    <doi>10.1093/beheco/arg073</doi>
                  </citation>
                  <citation key="2017052402101815000_284.1855.20170132.11">
                    <doi>10.1046/j.1420-9101.2003.00537.x</doi>
                  </citation>
                  <citation key="2017052402101815000_284.1855.20170132.12">
                    <doi>10.1093/beheco/ari055</doi>
                  </citation>
                  <citation key="2017052402101815000_284.1855.20170132.13">
                    <doi>10.1016/j.cub.2009.01.045</doi>
                  </citation>
                  <citation key="2017052402101815000_284.1855.20170132.14">
                    <doi>10.1016/j.cub.2012.10.009</doi>
                  </citation>
                  <citation key="2017052402101815000_284.1855.20170132.15">
                    <doi>10.1073/pnas.101440698</doi>
                  </citation>
                  <citation key="2017052402101815000_284.1855.20170132.16">
                    <doi>10.1554/0014-3820(2002)056[0936:CEOMAF]2.0.CO;2</doi>
                  </citation>
                  <citation key="2017052402101815000_284.1855.20170132.17">
                    <doi>10.1186/1471-2148-5-25</doi>
                  </citation>
                  <citation key="2017052402101815000_284.1855.20170132.18">
                    <doi>10.1371/journal.pone.0000522</doi>
                  </citation>
                  <citation key="2017052402101815000_284.1855.20170132.19">
                    <doi>10.1073/pnas.0701170104</doi>
                  </citation>
                  <citation key="2017052402101815000_284.1855.20170132.20">
                    <doi>10.1111/j.1420-9101.2010.01991.x</doi>
                  </citation>
                  <citation key="2017052402101815000_284.1855.20170132.21">
                    <doi>10.1111/j.1095-8312.2001.tb01359.x</doi>
                  </citation>
                  <citation key="2017052402101815000_284.1855.20170132.22">
                    <doi>10.1111/j.1558-5646.2011.01464.x</doi>
                  </citation>
                  <citation key="2017052402101815000_284.1855.20170132.23">
                    <journal_title>Biol. J. Linn. Soc.</journal_title>
                    <author>Bilton</author>
                    <volume>119</volume>
                    <first_page>1089</first_page>
                    <cYear>2016</cYear>
                    <doi provider="crossref">10.1111/bij.12850</doi>
                    <article_title>Sexual dimorphism and sexual conflict in the diving beetle Agabus uliginosus (L.)(Coleoptera: Dytiscidae)</article_title>
                  </citation>
                  <citation key="2017052402101815000_284.1855.20170132.24">
                    <doi>10.1098/rspb.2010.2453</doi>
                  </citation>
                  <citation key="2017052402101815000_284.1855.20170132.25">
                    <doi>10.1093/beheco/arh119</doi>
                  </citation>
                  <citation key="2017052402101815000_284.1855.20170132.26">
                    <doi>10.1098/rspb.2006.3710</doi>
                  </citation>
                  <citation key="2017052402101815000_284.1855.20170132.27">
                    <doi>10.1016/j.anbehav.2009.06.036</doi>
                  </citation>
                  <citation key="2017052402101815000_284.1855.20170132.28">
                    <doi>10.1111/j.0307-6946.2005.00730.x</doi>
                  </citation>
                  <citation key="2017052402101815000_284.1855.20170132.29">
                    <doi>10.1111/j.1570-7458.2011.01187.x</doi>
                  </citation>
                  <citation key="2017052402101815000_284.1855.20170132.30">
                    <doi>10.1038/415787a</doi>
                  </citation>
                  <citation key="2017052402101815000_284.1855.20170132.31">
                    <doi>10.1111/j.1558-5646.2007.00315.x</doi>
                  </citation>
                  <citation key="2017052402101815000_284.1855.20170132.32">
                    <doi>10.1098/rspb.2009.2026</doi>
                  </citation>
                  <citation key="2017052402101815000_284.1855.20170132.33">
                    <doi>10.1016/j.anbehav.2011.10.007</doi>
                  </citation>
                  <citation key="2017052402101815000_284.1855.20170132.34">
                    <doi>10.1098/rspb.2015.1421</doi>
                  </citation>
                  <citation key="2017052402101815000_284.1855.20170132.35">
                    <journal_title>BMC Evol. Biol.</journal_title>
                    <author>Goenaga</author>
                    <volume>15</volume>
                    <first_page>266</first_page>
                    <cYear>2015</cYear>
                    <doi provider="crossref">10.1186/s12862-015-0547-2</doi>
                    <article_title>Within-species divergence in the seminal fluid proteome and its effect on male and female reproduction in a beetle</article_title>
                  </citation>
                  <citation key="2017052402101815000_284.1855.20170132.36">
                    <doi>10.1186/1472-6793-9-11</doi>
                  </citation>
                  <citation key="2017052402101815000_284.1855.20170132.37">
                    <doi>10.2307/4087240</doi>
                  </citation>
                  <citation key="2017052402101815000_284.1855.20170132.38">
                    <doi>10.1002/arch.20056</doi>
                  </citation>
                  <citation key="2017052402101815000_284.1855.20170132.39">
                    <doi>10.1111/evo.12422</doi>
                  </citation>
                  <citation key="2017052402101815000_284.1855.20170132.40">
                    <unstructured_citation>R Development Core Team. 2015 R: a language and environment for statistical computing. Vienna, Austria: R Foundation for Statistical Computing.</unstructured_citation>
                  </citation>
                  <citation key="2017052402101815000_284.1855.20170132.41">
                    <unstructured_citation>VSN International. 2015 Genstat for Windows 18th Edition. Hemel Hempstead, UK: VSN International.</unstructured_citation>
                  </citation>
                  <citation key="2017052402101815000_284.1855.20170132.42">
                    <journal_title>Am. Nat.</journal_title>
                    <author>Berger</author>
                    <volume>188</volume>
                    <first_page>E98</first_page>
                    <cYear>2016</cYear>
                    <doi provider="crossref">10.1086/687963</doi>
                    <article_title>Intralocus sexual conflict and the tragedy of the commons in seed beetles</article_title>
                  </citation>
                  <citation key="2017052402101815000_284.1855.20170132.43">
                    <doi>10.1098/rsbl.2009.0433</doi>
                  </citation>
                  <citation key="2017052402101815000_284.1855.20170132.44">
                    <doi>10.1111/j.1558-5646.2011.01309.x</doi>
                  </citation>
                  <citation key="2017052402101815000_284.1855.20170132.45">
                    <doi>10.1111/j.1469-7998.2011.00892.x</doi>
                  </citation>
                  <citation key="2017052402101815000_284.1855.20170132.46">
                    <doi>10.1098/rspb.2015.0724</doi>
                  </citation>
                  <citation key="2017052402101815000_284.1855.20170132.47">
                    <doi>10.1073/pnas.1505797112</doi>
                  </citation>
                  <citation key="2017052402101815000_284.1855.20170132.48">
                    <doi>10.1007/BF01953792</doi>
                  </citation>
                  <citation key="2017052402101815000_284.1855.20170132.49">
                    <doi>10.1007/s11692-012-9193-4</doi>
                  </citation>
                  <citation key="2017052402101815000_284.1855.20170132.50">
                    <journal_title>Biogerontology</journal_title>
                    <author>Lazarević</author>
                    <volume>14</volume>
                    <first_page>141</first_page>
                    <cYear>2013</cYear>
                    <doi provider="crossref">10.1007/s10522-013-9417-8</doi>
                    <article_title>Resistance to prooxidant agent paraquat in the short- and long-lived lines of the seed beetle (Acanthoscelides obtectus)</article_title>
                  </citation>
                  <citation key="2017052402101815000_284.1855.20170132.51">
                    <doi>10.1034/j.1600-0706.2000.880110.x</doi>
                  </citation>
                  <citation key="2017052402101815000_284.1855.20170132.52">
                    <doi>10.1146/annurev-ento-010715-023924</doi>
                  </citation>
                  <citation key="2017052402101815000_284.1855.20170132.53">
                    <doi>10.1086/659947</doi>
                  </citation>
                  <citation key="2017052402101815000_284.1855.20170132.54">
                    <unstructured_citation>Dougherty LR , van Lieshout E , McNamara KB , Moschilla JA , Arnqvist G , Simmons LW . 2017 Sexual conflict and correlated evolution between male persistence and female resistance traits in the seed beetle Callosobruchus maculatus . Dryad Digital Repository (http://dx.doi.org/10.5061/dryad.1b15j)</unstructured_citation>
                  </citation>
                </citation_list>
              </journal_article>
            </journal>
          </crossref>
        </doi_record>
      </query>
    </body>
  </query_result>
</crossref_result>
|
90
|
+
http_version:
|
91
|
+
recorded_at: Sat, 06 Jul 2019 06:15:01 GMT
|
92
|
+
recorded_with: VCR 3.0.3
|
@@ -249,13 +249,29 @@ describe Bolognese::Metadata, vcr: true do
|
|
249
249
|
expect(subject.url).to eq("http://journals.openedition.org/dms/865")
|
250
250
|
expect(subject.types).to eq("bibtex"=>"article", "citeproc"=>"article-journal", "resourceType"=>"JournalArticle", "resourceTypeGeneral"=>"Text", "ris"=>"JOUR", "schemaOrg"=>"ScholarlyArticle")
|
251
251
|
expect(subject.creators).to eq("familyName"=>"Peraya", "givenName"=>"Daniel", "name"=>"Peraya, Daniel", "nameType"=>"Personal")
|
252
|
-
expect(subject.titles).to eq([{"title"=>"Distances, absence, proximités et présences
|
252
|
+
expect(subject.titles).to eq([{"title"=>"Distances, absence, proximités et présences : des concepts en déplacement"}, {"title"=>"Distance(s), proximity and presence(s): evolving concepts"}])
|
253
253
|
expect(subject.dates).to eq([{"date"=>"2014-12-23", "dateType"=>"Issued"}, {"date"=>"2019-02-02T06:53:25Z", "dateType"=>"Updated"}])
|
254
254
|
expect(subject.publication_year).to eq("2014")
|
255
255
|
expect(subject.publisher).to eq("OpenEdition")
|
256
256
|
expect(subject.agency).to eq("Crossref")
|
257
257
|
end
|
258
258
|
|
259
|
+
it "markup" do
|
260
|
+
input = "https://doi.org/10.1098/rspb.2017.0132"
|
261
|
+
subject = Bolognese::Metadata.new(input: input)
|
262
|
+
#expect(subject.valid?).to be true
|
263
|
+
expect(subject.identifiers).to eq([{"identifier"=>"https://doi.org/10.1098/rspb.2017.0132", "identifierType"=>"DOI"}, {"identifier"=>"/royprsb/284/1855/20170132.atom", "identifierType"=>"Publisher ID"}])
|
264
|
+
expect(subject.url).to eq("http://rspb.royalsocietypublishing.org/lookup/doi/10.1098/rspb.2017.0132")
|
265
|
+
expect(subject.types).to eq("bibtex"=>"article", "citeproc"=>"article-journal", "resourceType"=>"JournalArticle", "resourceTypeGeneral"=>"Text", "ris"=>"JOUR", "schemaOrg"=>"ScholarlyArticle")
|
266
|
+
expect(subject.creators.size).to eq(6)
|
267
|
+
expect(subject.creators.first).to eq("familyName" => "Dougherty","givenName" => "Liam R.","name" => "Dougherty, Liam R.","nameIdentifiers" => [{"nameIdentifier"=>"https://orcid.org/0000-0003-1406-0680", "nameIdentifierScheme"=>"ORCID", "schemeUri"=>"https://orcid.org"}],"nameType"=>"Personal")
|
268
|
+
expect(subject.titles).to eq([{"title"=>"Sexual conflict and correlated evolution between male persistence and female resistance traits in the seed beetle <i>Callosobruchus maculatus</i>"}])
|
269
|
+
expect(subject.dates).to eq([{"date"=>"2017-05-24", "dateType"=>"Issued"}, {"date"=>"2017-05-24T09:13:39Z", "dateType"=>"Updated"}])
|
270
|
+
expect(subject.publication_year).to eq("2017")
|
271
|
+
expect(subject.publisher).to eq("The Royal Society")
|
272
|
+
expect(subject.agency).to eq("Crossref")
|
273
|
+
end
|
274
|
+
|
259
275
|
it "journal article with" do
|
260
276
|
input = "https://doi.org/10.1111/nph.14619"
|
261
277
|
subject = Bolognese::Metadata.new(input: input)
|
@@ -334,7 +334,7 @@ describe Bolognese::Metadata, vcr: true do
|
|
334
334
|
expect(subject.doi).to eq("10.6071/z7wc73")
|
335
335
|
expect(subject.creators.length).to eq(6)
|
336
336
|
expect(subject.creators.first).to eq("familyName"=>"Bales", "givenName"=>"Roger", "name"=>"Bales, Roger", "nameType"=>"Personal", "affiliation" => ["UC Merced", "NSF"])
|
337
|
-
expect(subject.titles).to eq([{"title"=>"Southern Sierra Critical Zone Observatory (SSCZO), Providence Creek
|
337
|
+
expect(subject.titles).to eq([{"title"=>"Southern Sierra Critical Zone Observatory (SSCZO), Providence Creek meteorological data, soil moisture and temperature, snow depth and air temperature"}])
|
338
338
|
expect(subject.publisher).to eq("UC Merced")
|
339
339
|
expect(subject.dates).to eq([{"date"=>"2014-10-17", "dateType"=>"Updated"}, {"date"=>"2016-03-14T17:02:02Z", "dateType"=>"Available"}, {"date"=>"2013", "dateType"=>"Issued"}])
|
340
340
|
expect(subject.publication_year).to eq("2013")
|
@@ -191,7 +191,7 @@ describe Bolognese::Metadata, vcr: true do
|
|
191
191
|
expect(subject.types).to eq("bibtex"=>"misc", "citeproc"=>"dataset", "resourceType"=>"dataset", "resourceTypeGeneral"=>"Dataset", "ris"=>"DATA", "schemaOrg"=>"Dataset")
|
192
192
|
expect(subject.creators.length).to eq(6)
|
193
193
|
expect(subject.creators.first).to eq("affiliation"=>["UC Merced", "NSF"], "familyName"=>"Bales", "givenName"=>"Roger", "name"=>"Bales, Roger", "nameType"=>"Personal")
|
194
|
-
expect(subject.titles).to eq([{"title"=>"Southern Sierra Critical Zone Observatory (SSCZO), Providence Creek
|
194
|
+
expect(subject.titles).to eq([{"title"=>"Southern Sierra Critical Zone Observatory (SSCZO), Providence Creek meteorological data, soil moisture and temperature, snow depth and air temperature"}])
|
195
195
|
expect(subject.identifiers).to eq([{"identifier"=>"https://doi.org/10.6071/z7wc73", "identifierType"=>"DOI"}])
|
196
196
|
expect(subject.rights_list).to eq([{"rights"=>"Creative Commons Attribution 4.0 International (CC BY 4.0)", "rightsUri"=>"https://creativecommons.org/licenses/by/4.0"}])
|
197
197
|
expect(subject.dates).to eq([{"date"=>"2014-10-17", "dateType"=>"Updated"}, {"date"=>"2016-03-14T17:02:02Z", "dateType"=>"Available"}, {"date"=>"2013", "dateType"=>"Issued"}])
|
@@ -193,7 +193,7 @@ describe Bolognese::Metadata, vcr: true do
|
|
193
193
|
json = JSON.parse(subject.schema_org)
|
194
194
|
expect(json["@id"]).to eq("https://doi.org/10.6071/z7wc73")
|
195
195
|
expect(json["@type"]).to eq("Dataset")
|
196
|
-
expect(json["name"]).to eq("Southern Sierra Critical Zone Observatory (SSCZO), Providence Creek
|
196
|
+
expect(json["name"]).to eq("Southern Sierra Critical Zone Observatory (SSCZO), Providence Creek meteorological data, soil moisture and temperature, snow depth and air temperature")
|
197
197
|
expect(json["author"].length).to eq(6)
|
198
198
|
expect(json["author"][2]).to eq("@id"=>"https://orcid.org/0000-0002-8862-1404", "@type"=>"Person", "familyName"=>"Stacy", "givenName"=>"Erin", "name"=>"Erin Stacy", "affiliation" => {"@type"=>"Organization", "name"=>"UC Merced"})
|
199
199
|
expect(json["includedInDataCatalog"]).to be_nil
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: bolognese
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.2.
|
4
|
+
version: 1.2.6
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Martin Fenner
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2019-07-
|
11
|
+
date: 2019-07-06 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: maremma
|
@@ -826,6 +826,7 @@ files:
|
|
826
826
|
- spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_crossref_metadata/journal_article.yml
|
827
827
|
- spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_crossref_metadata/journal_article_with.yml
|
828
828
|
- spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_crossref_metadata/mEDRA.yml
|
829
|
+
- spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_crossref_metadata/markup.yml
|
829
830
|
- spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_crossref_metadata/missing_creator.yml
|
830
831
|
- spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_crossref_metadata/multiple_t.yml
|
831
832
|
- spec/fixtures/vcr_cassettes/Bolognese_Metadata/get_crossref_metadata/multiple_titles.yml
|