bolognese 0.9.9 → 0.9.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9bacba9acee9d8a4338c5f8d205965044f2ea32b
-  data.tar.gz: 14ff4fdc282bc76b6836a4fe28b1553e10746c85
+  metadata.gz: 377a3f37e23c41ed429941877c78dcaab6cb99ff
+  data.tar.gz: 348385911730ae1b2048611b1aa25f0fab53014e
 SHA512:
-  metadata.gz: e238cc8ba77137bd6ed6b8737644af53e35658cb8055bf97758652b9a85bd57d70c83c9bdc04304e3549b6cdb78907bb68f8d02bef226274b933203e599f90fa
-  data.tar.gz: ed8213e1277438363eac0a1838f85d52936b7ea4c0d70d49c3611f53c9ff2928bf99f891fa1bed2d02299af2529f3567caaf80406d652faa2bc7674a7fe2f1e1
+  metadata.gz: 83ce137cc0f5c9f9349284f71651e64464d23c565f38fe5e36f7e3febf1f584d8763885c2a0c2fbf635664a1a3c5e5f916475b8a65177fea4ea6d5983433f804
+  data.tar.gz: b8eccf2ff3ecabb012dbbd8705b64da88a14f4e65009e3a777a4610f76544fc5524aff0b2d9b63b5526ee2ddd62fa93514151592e29cce38ee1f4c4a16d12c93

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bolognese (0.9.9)
+    bolognese (0.9.10)
       activesupport (>= 4.2.5, < 6)
       benchmark_methods (~> 0.7)
       bibtex-ruby (~> 4.1)

data/lib/bolognese/readers/citeproc_reader.rb

@@ -8,7 +8,6 @@ module Bolognese
         "graphic" => "ImageObject",
         "motion_picture" => "Movie",
         "article-journal" => "ScholarlyArticle",
-        "computer_program" => "SoftwareSourceCode",
         "broadcast" => "VideoObject",
         "webpage" => "WebPage"
       }
@@ -20,7 +19,6 @@ module Bolognese
         "book" => "BOOK",
         "motion_picture" => "MPCT",
         "article-journal" => "JOUR",
-        "computer_program" => "COMP",
         "broadcast" => "MPCT",
         "webpage" => "ELEC"
       }

data/lib/bolognese/utils.rb

@@ -36,7 +36,6 @@ module Bolognese
       "Model" => nil,
       "PhysicalObject" => nil,
       "Service" => nil,
-      "Software" => "computer_program",
       "Sound" => "song",
       "Text" => "report",
       "Workflow" => nil,
@@ -107,7 +106,6 @@ module Bolognese
       "PublicationIssue" => nil,
       "ScholarlyArticle" => "article-journal",
       "Service" => nil,
-      "SoftwareSourceCode" => "computer_program",
       "VideoObject" => "broadcast",
       "WebPage" => "webpage",
       "WebSite" => "webpage"

data/lib/bolognese/version.rb

@@ -1,3 +1,3 @@
 module Bolognese
-  VERSION = "0.9.9"
+  VERSION = "0.9.10"
 end

data/lib/bolognese/writers/schema_org_writer.rb

@@ -12,8 +12,8 @@ module Bolognese
           "alternateName" => alternate_name,
           "author" => to_schema_org(author),
           "editor" => editor,
-          "description" => Array.wrap(description).map { |d| d["text"] }.unwrap,
-          "license" => license.present? ? license["id"] : nil,
+          "description" => Array.wrap(description).map { |d| d["text"] }.compact.unwrap,
+          "license" => Array.wrap(license).map { |l| l["id"] }.compact.unwrap,
           "version" => version,
           "keywords" => keywords,
           "inLanguage" => language,

data/spec/fixtures/vcr_cassettes/Bolognese_Metadata/write_metadata_as_schema_org/Schema_org_JSON.yml

@@ -0,0 +1,40 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://search.datacite.org/api?fl=doi,xml,media,minted,updated&q=doi:10.5281/zenodo.48440&wt=json
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Maremma - https://github.com/datacite/maremma
+      Accept:
+      - text/html,application/json,application/xml;q=0.9, text/plain;q=0.8,image/png,*/*;q=0.5
+  response:
+    status:
+      code: 200
+      message: ''
+    headers:
+      Access-Control-Allow-Methods:
+      - GET, POST, OPTIONS
+      Access-Control-Allow-Origin:
+      - "*"
+      Content-Type:
+      - application/json;charset=UTF-8
+      Date:
+      - Sat, 06 May 2017 14:02:20 GMT
+      Server:
+      - openresty/1.11.2.2
+      Content-Length:
+      - '3892'
+      Connection:
+      - keep-alive
+    body:
+      encoding: UTF-8
+      string: '{"responseHeader":{"status":0,"QTime":0},"response":{"numFound":1,"start":0,"docs":[{"xml":"PHJlc291cmNlIHhtbG5zPSJodHRwOi8vZGF0YWNpdGUub3JnL3NjaGVtYS9rZXJuZWwtMyIgeG1sbnM6eHNpPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxL1hNTFNjaGVtYS1pbnN0YW5jZSIgeHNpOnNjaGVtYUxvY2F0aW9uPSJodHRwOi8vZGF0YWNpdGUub3JnL3NjaGVtYS9rZXJuZWwtMyBodHRwOi8vc2NoZW1hLmRhdGFjaXRlLm9yZy9tZXRhL2tlcm5lbC0zL21ldGFkYXRhLnhzZCI+CiAgPGlkZW50aWZpZXIgaWRlbnRpZmllclR5cGU9IkRPSSI+MTAuNTI4MS96ZW5vZG8uNDg0NDA8L2lkZW50aWZpZXI+CiAgPGNyZWF0b3JzPgogICAgPGNyZWF0b3I+CiAgICAgIDxjcmVhdG9yTmFtZT5LcmlzdGlhbiBHYXJ6YTwvY3JlYXRvck5hbWU+CiAgICA8L2NyZWF0b3I+CiAgPC9jcmVhdG9ycz4KICA8dGl0bGVzPgogICAgPHRpdGxlPkFuYWx5c2lzIFRvb2xzIGZvciBDcm9zc292ZXIgRXhwZXJpbWVudCBvZiBVSSB1c2luZyBDaG9pY2UgQXJjaGl0ZWN0dXJlPC90aXRsZT4KICA8L3RpdGxlcz4KICA8cHVibGlzaGVyPlplbm9kbzwvcHVibGlzaGVyPgogIDxwdWJsaWNhdGlvblllYXI+MjAxNjwvcHVibGljYXRpb25ZZWFyPgogIDxzdWJqZWN0cz4KICAgIDxzdWJqZWN0PmNob2ljZSBhcmNoaXRlY3R1cmU8L3N1YmplY3Q+CiAgICA8c3ViamVjdD5jcm9zc292ZXIgZXhwZXJpbWVudDwvc3ViamVjdD4KICAgIDxzdWJqZWN0PmhjaTwvc3ViamVjdD4KICA8L3N1YmplY3RzPgogIDxkYXRlcz4KICAgIDxkYXRlIGRhdGVUeXBlPSJJc3N1ZWQiPjIwMTYtMDMtMjc8L2RhdGU+CiAgPC9kYXRlcz4KICA8cmVzb3VyY2VUeXBlIHJlc291cmNlVHlwZUdlbmVyYWw9IlNvZnR3YXJlIi8+CiAgPGFsdGVybmF0ZUlkZW50aWZpZXJzPgogICAgPGFsdGVybmF0ZUlkZW50aWZpZXIgYWx0ZXJuYXRlSWRlbnRpZmllclR5cGU9IlVSTCI+aHR0cDovL3plbm9kby5vcmcvcmVjb3JkLzQ4NDQwPC9hbHRlcm5hdGVJZGVudGlmaWVyPgogIDwvYWx0ZXJuYXRlSWRlbnRpZmllcnM+CiAgPHJlbGF0ZWRJZGVudGlmaWVycz4KICAgIDxyZWxhdGVkSWRlbnRpZmllciByZWxhdGlvblR5cGU9IklzU3VwcGxlbWVudFRvIiByZWxhdGVkSWRlbnRpZmllclR5cGU9IlVSTCI+aHR0cHM6Ly9naXRodWIuY29tL2tqZ2FyemEvZnJhbWVfZXhwZXJpbWVudF9hbmFseXNpcy90cmVlL3YxLjA8L3JlbGF0ZWRJZGVudGlmaWVyPgogIDwvcmVsYXRlZElkZW50aWZpZXJzPgogIDxyaWdodHNMaXN0PgogICAgPHJpZ2h0cyByaWdodHNVUkk9ImluZm86ZXUtcmVwby9zZW1hbnRpY3Mvb3BlbkFjY2VzcyI+T3BlbiBBY2Nlc3M8L3JpZ2h0cz4KICAgIDxyaWdodHMgcmlnaHRzVVJJPSJodHRwczovL2NyZWF0aXZlY29tbW9ucy5vcmcvbGljZW5zZXMvYnktbmMtc2EvNC4wLyI+Q3JlYXRpdmUgQ29tbW9ucyBBdHRyaWJ1dGlvbi1Ob25Db21tZXJjaWFsLVNoYXJlQWxpa2U8L3JpZ2h0cz4KICA8L3JpZ2h0c0xpc3Q+CiAgPGRlc2NyaXB0aW9ucz4KICAgIDxkZXNjcmlwdGlvbiBkZXNjcmlwdGlvblR5cGU9IkFic3RyYWN0Ij4mbHQ7cCZndDsmYW1wO25ic3A7Jmx0Oy9wJmd0OwoKJmx0O3AmZ3Q7VGhpcyB0b29scyBhcmUgdXNlZCB0byBhbmFseXNlIHRoZSBkYXRhIHByb2R1Y2VkIGJ5IHRoZSBDcm9zc3NvdmVyIEV4cGVyaW1lbnQgSSBkZXNpZ25lZCB0byB0ZXN0IENob2ljZSBBcmNoaXRlY3R1cmUgdGVjaG5pcXVlcyBhcyBVSSBpbnRlcnZlbnRpb25zIGluIGEgU0VFazRTY2llbmNlIGRhdGEgY2F0YWxvZ3VlLiBJdCBjb250YWluczombHQ7L3AmZ3Q7CgombHQ7cCZndDstIERhdGEgc3RydWN0dXJlcyBmb3IgdGhlIGV4cGVyaW1lbnRhbCBkYXRhLiZsdDticiAvJmd0OwotIFZpc3VhbGlzYXRpb24gZnVuY3Rpb25zJmx0O2JyIC8mZ3Q7Ci0gQW5hbHlzaXMgZnVuY3Rpb25zJmx0Oy9wJmd0OwoKJmx0O3AmZ3Q7IyMgSW5zdGFsbGF0aW9uJmx0Oy9wJmd0OwoKJmx0O3AmZ3Q7LSBSJmx0O2JyIC8mZ3Q7Ci0gcHl0aG9uJmx0O2JyIC8mZ3Q7Ci0gaXB5dGhvbiA0Jmx0Oy9wJmd0OwoKJmx0O3AmZ3Q7Q2xvbmUgYW5kIHVzZS4mbHQ7L3AmZ3Q7CgombHQ7cCZndDsjIyBVc2FnZSZsdDsvcCZndDsKCiZsdDtwJmd0OyZsdDticiAvJmd0OwpgYGBweXRob24mbHQ7YnIgLyZndDsKc291cmNlKCZhbXA7IzM5O3BhcmFsbGVsX3Bsb3QuciZhbXA7IzM5OykmbHQ7YnIgLyZndDsKd2l0aCh6LCBwYXJhbGxlbHNldCh0cnQscmVzcG9uc2UsIGZyZXE9Y291bnQsIGFscGhhPTAuMikpJmx0O2JyIC8mZ3Q7CmBgYCZsdDsvcCZndDsKCiZsdDtwJmd0OyZsdDticiAvJmd0OwojIyBDb250cmlidXRpbmcmbHQ7L3AmZ3Q7CgombHQ7cCZndDsxLiBGb3JrIGl0ISZsdDticiAvJmd0OwoyLiBDcmVhdGUgeW91ciBmZWF0dXJlIGJyYW5jaDogYGdpdCBjaGVja291dCAtYiBteS1uZXctZmVhdHVyZWAmbHQ7YnIgLyZndDsKMy4gQ29tbWl0IHlvdXIgY2hhbmdlczogYGdpdCBjb21taXQgLWFtICZhbXA7IzM5O0FkZCBzb21lIGZlYXR1cmUmYW1wOyMzOTtgJmx0O2JyIC8mZ3Q7CjQuIFB1c2ggdG8gdGhlIGJyYW5jaDogYGdpdCBwdXNoIG9yaWdpbiBteS1uZXctZmVhdHVyZWAmbHQ7YnIgLyZndDsKNS4gU3VibWl0IGEgcHVsbCByZXF1ZXN0IDpEJmx0Oy9wJmd0OwoKJmx0O3AmZ3Q7Jmx0O2JyIC8mZ3Q7CiMjIExpY2Vuc2UmbHQ7L3AmZ3Q7CgombHQ7cCZndDtUaGlzIHdvcmsgc3VwcG9ydHMgbXkgUGhEIFRoZXNpcyBhdCBVbml2ZXJzaXR5IG9mIE1hbmNoZXN0ZXIuJmx0Oy9wJmd0OzwvZGVzY3JpcHRpb24+CiAgPC9kZXNjcmlwdGlvbnM+CjwvcmVzb3VyY2U+Cg==","minted":"2016-03-27T22:18:38Z","updated":"2016-04-04T15:04:33Z","doi":"10.5281/ZENODO.48440"}]}}
+
+'
+    http_version: 
+  recorded_at: Sat, 06 May 2017 14:02:20 GMT
+recorded_with: VCR 3.0.3

data/spec/writers/citeproc_writer_spec.rb

@@ -126,7 +126,7 @@ describe Bolognese::Metadata, vcr: true do
       input = "https://github.com/datacite/maremma"
       subject = Bolognese::Metadata.new(input: input, from: "codemeta")
       json = JSON.parse(subject.citeproc)
-      expect(json["type"]).to eq("computer_program")
+      expect(json["type"]).to eq("article-journal")
       expect(json["id"]).to eq("https://doi.org/10.5438/qeg0-3gm3")
       expect(json["DOI"]).to eq("10.5438/qeg0-3gm3")
       expect(json["title"]).to eq("Maremma: a Ruby library for simplified network calls")

data/spec/writers/schema_org_writer_spec.rb

@@ -19,6 +19,15 @@ describe Bolognese::Metadata, vcr: true do
       expect(json["author"]).to eq("name"=>"Martin Fenner", "givenName"=>"Martin", "familyName"=>"Fenner", "@type"=>"Person", "@id"=>"http://orcid.org/0000-0003-0077-4738")
     end
 
+    it "Schema.org JSON" do
+      input = "https://doi.org/10.5281/ZENODO.48440"
+      subject = Bolognese::Metadata.new(input: input, from: "datacite")
+      json = JSON.parse(subject.schema_org)
+      expect(json["@id"]).to eq("https://doi.org/10.5281/zenodo.48440")
+      expect(json["name"]).to eq("Analysis Tools for Crossover Experiment of UI using Choice Architecture")
+      expect(json["license"]).to eq("https://creativecommons.org/licenses/by-nc-sa/4.0")
+    end
+
     it "Schema.org JSON isReferencedBy" do
       input = "https://doi.org/10.5061/DRYAD.8515"
       subject = Bolognese::Metadata.new(input: input, from: "datacite")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bolognese
 version: !ruby/object:Gem::Version
-  version: 0.9.9
+  version: 0.9.10
 platform: ruby
 authors:
 - Martin Fenner
@@ -714,6 +714,7 @@ files:
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/write_metadata_as_ris/journal_article.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/write_metadata_as_ris/maremma.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/write_metadata_as_ris/with_pages.yml
+- spec/fixtures/vcr_cassettes/Bolognese_Metadata/write_metadata_as_schema_org/Schema_org_JSON.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/write_metadata_as_schema_org/Schema_org_JSON_IsSupplementTo.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/write_metadata_as_schema_org/Schema_org_JSON_isReferencedBy.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Metadata/write_metadata_as_schema_org/journal_article.yml