bolognese 0.9.6 → 0.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3d7e93701080fa5283292b961de72db0826a507
-  data.tar.gz: 49932167206fa2b04e1d16f20097a82264eeb02b
+  metadata.gz: a1d9173be073023c912d3d2a912fda4d255d7d69
+  data.tar.gz: a38086bc705ab16472df35e2950f1139ec5416a2
 SHA512:
-  metadata.gz: 8f98dc3e1fe55fd077ffd166e38db5535181adafaa12117d65894ad88324e12958585f0d23eb3c2aac2cadbf08c44abc3eb4770f4e0a696d5ae73ad183ebc74e
-  data.tar.gz: c6eb619fef41ba0b811820e590365e238617f6bdad8c312688e9186fdd7a542a04a1e920e53d7c0923502cc3153a86ac4e7dedd5b0fb93f5f165a9119bdc9b18
+  metadata.gz: a594ce7e95bcfd9f80bd09869b2b4fc7b0b3de2581f05e04a0c63f2fce0dd23e0c4538c17c2637fffb3aec60ce89bc2d87d30fd63ba2e358b7c7c307df816ad9
+  data.tar.gz: 9c903574125858d6c2cb80de55f22167ffbb86d428e541d1a464a4771e8bfb9352cecd45d34cfde4c93f63e289936e59e94c832d3ef0756e830233562bf4ad1b

data/Gemfile.lock

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

data/lib/bolognese/datacite.rb

@@ -106,7 +106,13 @@ module Bolognese
     end
 
     def keywords
-      Array.wrap(metadata.dig("subjects", "subject")).join(", ").presence
+      Array.wrap(metadata.dig("subjects", "subject")).map do |k|
+        if k.is_a?(String)
+          sanitize(k)
+        else
+          k.fetch("__content__", nil)
+        end
+      end.compact.join(", ").presence
     end
 
     def author

data/lib/bolognese/metadata.rb

@@ -44,6 +44,14 @@ module Bolognese
         "isBasedOn" => Array.wrap(is_supplement_to).map { |r| { "@id" => r["id"] }}.unwrap }.compact
     end
 
+    def name
+      if title.is_a?(Hash)
+        title["text"]
+      else
+        title
+      end
+    end
+
     def schema_hsh
       {
         "@context" => id.present? ? "http://schema.org" : nil,
@@ -51,7 +59,7 @@ module Bolognese
         "@id" => id,
         "url" => url,
         "additionalType" => additional_type,
-        "name" => title,
+        "name" => name,
         "alternateName" => alternate_name,
         "author" => to_schema_org(author),
         "editor" => editor,
@@ -59,7 +67,7 @@ module Bolognese
         "license" => license.present? ? license["id"] : nil,
         "version" => version,
         "keywords" => keywords,
-        "language" => language,
+        "inLanguage" => language,
         "contentSize" => content_size,
         "dateCreated" => date_created,
         "datePublished" => date_published,

data/lib/bolognese/version.rb

@@ -1,3 +1,3 @@
 module Bolognese
-  VERSION = "0.9.6"
+  VERSION = "0.9.7"
 end

data/spec/datacite_spec.rb

@@ -151,6 +151,14 @@ describe Bolognese::Datacite, vcr: true do
       expect(subject.author.first).to eq("type"=>"Person", "name"=>"Masashi Otani", "givenName"=>"Masashi", "familyName"=>"Otani")
     end
 
+    it "keywords with attributes" do
+      id = "https://doi.org/10.21233/n34n5q"
+      subject = Bolognese::Datacite.new(id: id)
+      expect(subject.valid?).to be true
+      expect(subject.id).to eq("https://doi.org/10.21233/n34n5q")
+      expect(subject.keywords).to eq("Paleoecology")
+    end
+
     it "Funding schema version 4" do
       id = "https://doi.org/10.5438/6423"
       subject = Bolognese::Datacite.new(id: id)

data/spec/fixtures/vcr_cassettes/Bolognese_Datacite/get_metadata/keywords_with_attributes.yml

@@ -0,0 +1,38 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://search.datacite.org/api?fl=doi,xml,media,minted,updated&q=doi:10.21233/n34n5q&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:
+      - Mon, 24 Apr 2017 21:16:43 GMT
+      Server:
+      - openresty/1.11.2.2
+      Connection:
+      - keep-alive
+    body:
+      encoding: UTF-8
+      string: '{"responseHeader":{"status":0,"QTime":4},"response":{"numFound":1,"start":0,"docs":[{"xml":"PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHJlc291cmNlIHhtbG5zPSJodHRwOi8vZGF0YWNpdGUub3JnL3NjaGVtYS9rZXJuZWwtMyIgeG1sbnM6eHNpPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxL1hNTFNjaGVtYS1pbnN0YW5jZSIgeHNpOnNjaGVtYUxvY2F0aW9uPSJodHRwOi8vZGF0YWNpdGUub3JnL3NjaGVtYS9rZXJuZWwtMyBodHRwOi8vc2NoZW1hLmRhdGFjaXRlLm9yZy9tZXRhL2tlcm5lbC0zL21ldGFkYXRhLnhzZCI+ICA8aWRlbnRpZmllciBpZGVudGlmaWVyVHlwZT0iRE9JIj4xMC4yMTIzMy9OMzRONVE8L2lkZW50aWZpZXI+ICA8Y3JlYXRvcnM+ICAgIDxjcmVhdG9yPiAgICAgIDxjcmVhdG9yTmFtZT5BbmRyZXdzLCBKb2huIFQuPC9jcmVhdG9yTmFtZT4gICAgICA8YWZmaWxpYXRpb24+RGVwYXJ0bWVudCBvZiBHZW9sb2dpY2FsIFNjaWVuY2VzLCBDYW1wdXMgQm94IDI1MCwgVW5pdmVyc2l0eSBvZiBDb2xvcmFkbywgQm91bGRlciwgQ08gODAzMDksIFVOSVRFRCBTVEFURVM8L2FmZmlsaWF0aW9uPiAgICA8L2NyZWF0b3I+ICA8L2NyZWF0b3JzPiAgPHRpdGxlcz4gICAgPHRpdGxlIHhtbDpsYW5nPSJlbi11cyI+TnVlbHRpbiBMYWtlIFNpdGUgMSBwb2xsZW4gc3VyZmFjZSBzYW1wbGUgZGF0YXNldDwvdGl0bGU+ICA8L3RpdGxlcz4gIDxwdWJsaXNoZXI+TmVvdG9tYSBQYWxlb2Vjb2xvZ2ljYWwgRGF0YWJhc2U8L3B1Ymxpc2hlcj4gIDxwdWJsaWNhdGlvblllYXI+MjAxNzwvcHVibGljYXRpb25ZZWFyPiAgPHN1YmplY3RzPiAgICA8c3ViamVjdCBzdWJqZWN0U2NoZW1lPSJMaWJyYXJ5IG9mIENvbmdyZXNzIiBzY2hlbWVVUkk9Imh0dHA6Ly9pZC5sb2MuZ292L2F1dGhvcml0aWVzL3N1YmplY3RzIj5QYWxlb2Vjb2xvZ3k8L3N1YmplY3Q+ICA8L3N1YmplY3RzPiAgPGNvbnRyaWJ1dG9ycz4gICAgPGNvbnRyaWJ1dG9yIGNvbnRyaWJ1dG9yVHlwZT0iRGF0YUNvbGxlY3RvciI+ICAgICAgPGNvbnRyaWJ1dG9yTmFtZT5OaWNob2xzLCBIYXJ2ZXk8L2NvbnRyaWJ1dG9yTmFtZT4gICAgPC9jb250cmlidXRvcj4gICAgPGNvbnRyaWJ1dG9yIGNvbnRyaWJ1dG9yVHlwZT0iUHJvamVjdExlYWRlciI+ICAgICAgPGNvbnRyaWJ1dG9yTmFtZT5BbmRyZXdzLCBKb2huIFQuPC9jb250cmlidXRvck5hbWU+ICAgIDwvY29udHJpYnV0b3I+ICAgIDxjb250cmlidXRvciBjb250cmlidXRvclR5cGU9IkRhdGFDdXJhdG9yIj4gICAgICA8Y29udHJpYnV0b3JOYW1lPkdyaW1tLCBFcmljIENocmlzdG9waGVyPC9jb250cmlidXRvck5hbWU+ICAgIDwvY29udHJpYnV0b3I+ICAgIDxjb250cmlidXRvciBjb250cmlidXRvclR5cGU9IlJlc2VhcmNoZXIiPiAgICAgIDxjb250cmlidXRvck5hbWU+TmljaG9scywgSGFydmV5PC9jb250cmlidXRvck5hbWU+ICAgIDwvY29udHJpYnV0b3I+ICAgIDxjb250cmlidXRvciBjb250cmlidXRvclR5cGU9IlJlc2VhcmNoZXIiPiAgICAgIDxjb250cmlidXRvck5hbWU+QW5kcmV3cywgSm9obiBULjwvY29udHJpYnV0b3JOYW1lPiAgICA8L2NvbnRyaWJ1dG9yPiAgICA8Y29udHJpYnV0b3IgY29udHJpYnV0b3JUeXBlPSJEYXRhQ29sbGVjdG9yIj4gICAgICA8Y29udHJpYnV0b3JOYW1lPkFuZHJld3MsIEpvaG4gVC48L2NvbnRyaWJ1dG9yTmFtZT4gICAgPC9jb250cmlidXRvcj4gIDwvY29udHJpYnV0b3JzPiAgPGRhdGVzPiAgICA8ZGF0ZSBkYXRlVHlwZT0iU3VibWl0dGVkIj4xOTk4LTA2LTEyPC9kYXRlPiAgICA8ZGF0ZSBkYXRlVHlwZT0iU3VibWl0dGVkIj4xOTk4LTA2LTEyPC9kYXRlPiAgICA8ZGF0ZSBkYXRlVHlwZT0iQ3JlYXRlZCI+MTk5OC0wNi0xMjwvZGF0ZT4gICAgPGRhdGUgZGF0ZVR5cGU9IlVwZGF0ZWQiPjE5OTgtMDYtMTI8L2RhdGU+ICA8L2RhdGVzPiAgPGxhbmd1YWdlPkVuZ2xpc2g8L2xhbmd1YWdlPiAgPHJlc291cmNlVHlwZSByZXNvdXJjZVR5cGVHZW5lcmFsPSJEYXRhc2V0Ij5EYXRhc2V0L1BhbGVvZWNvbG9naWNhbCBTYW1wbGUgRGF0YTwvcmVzb3VyY2VUeXBlPiAgPHJlbGF0ZWRJZGVudGlmaWVycz4gICAgPHJlbGF0ZWRJZGVudGlmaWVyIHJlbGF0aW9uVHlwZT0iSXNNZXRhZGF0YUZvciIgcmVsYXRlZElkZW50aWZpZXJUeXBlPSJVUkwiIHJlbGF0ZWRNZXRhZGF0YVNjaGVtZT0ianNvbiI+YXBpLm5lb3RvbWFkYi5vcmcvdjEvZG93bmxvYWRzLzMxNTc8L3JlbGF0ZWRJZGVudGlmaWVyPiAgICA8cmVsYXRlZElkZW50aWZpZXIgcmVsYXRpb25UeXBlPSJJc01ldGFkYXRhRm9yIiByZWxhdGVkSWRlbnRpZmllclR5cGU9IlVSTCIgcmVsYXRlZE1ldGFkYXRhU2NoZW1lPSJqc29uIj5kYXRhLm5lb3RvbWFkYi5vcmcvZGF0YXNldHMvMzE1Ny9pbmRleC5odG1sPC9yZWxhdGVkSWRlbnRpZmllcj4gIDwvcmVsYXRlZElkZW50aWZpZXJzPiAgPHNpemVzPiAgICA8c2l6ZT4xMiBLQjwvc2l6ZT4gIDwvc2l6ZXM+ICA8Zm9ybWF0cz4gICAgPGZvcm1hdD5YTUw8L2Zvcm1hdD4gICAgPGZvcm1hdD5UTFg8L2Zvcm1hdD4gICAgPGZvcm1hdD5KU09OPC9mb3JtYXQ+ICA8L2Zvcm1hdHM+ICA8ZGVzY3JpcHRpb25zPiAgICA8ZGVzY3JpcHRpb24gZGVzY3JpcHRpb25UeXBlPSJBYnN0cmFjdCIgeG1sOmxhbmc9IkVOIj5SYXcgZGF0YSBmb3IgdGhlIE51ZWx0aW4gTGFrZSBTaXRlIDEgcG9sbGVuIHN1cmZhY2Ugc2FtcGxlIGRhdGFzZXQgb2J0YWluZWQgZnJvbSB0aGUgTmVvdG9tYSBQYWxlb2Vjb2xvZ2ljYWwgRGF0YWJhc2UuPC9kZXNjcmlwdGlvbj4gIDwvZGVzY3JpcHRpb25zPiAgPHJpZ2h0c0xpc3Q+ICAgIDxyaWdodHMgcmlnaHRzVVJJPSJodHRwOi8vY3JlYXRpdmVjb21tb25zLm9yZy9saWNlbnNlcy9ieS80LjAvZGVlZC5lbl9VUyI+Q0MtQlk0PC9yaWdodHM+ICA8L3JpZ2h0c0xpc3Q+ICA8Z2VvTG9jYXRpb25zPiAgICA8Z2VvTG9jYXRpb24+ICAgICAgPGdlb0xvY2F0aW9uQm94PjYwLjAzIC05OS44NSA2MC4wMyAtOTkuODU8L2dlb0xvY2F0aW9uQm94PiAgICA8L2dlb0xvY2F0aW9uPiAgPC9nZW9Mb2NhdGlvbnM+PC9yZXNvdXJjZT4=","minted":"2017-04-18T01:36:23Z","updated":"2017-04-18T01:36:23Z","doi":"10.21233/N34N5Q"}]}}
+
+'
+    http_version: 
+  recorded_at: Mon, 24 Apr 2017 21:16:43 GMT
+recorded_with: VCR 3.0.3

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bolognese
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors:
 - Martin Fenner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-24 00:00:00.000000000 Z
+date: 2017-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: maremma
@@ -598,6 +598,7 @@ files:
 - spec/fixtures/vcr_cassettes/Bolognese_Datacite/get_metadata/author_with_scheme.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Datacite/get_metadata/is_identical_to.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Datacite/get_metadata/jsonlint.yml
+- spec/fixtures/vcr_cassettes/Bolognese_Datacite/get_metadata/keywords_with_attributes.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Datacite/get_metadata/multiple_author_names_in_one_creatorName.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Datacite/get_metadata/multiple_licenses.yml
 - spec/fixtures/vcr_cassettes/Bolognese_Datacite/get_metadata_as_bibtex/BlogPosting.yml