Schema 4.5 - Initial release

Gemfile

@@ -12,7 +12,8 @@ gem "aws-sdk-sqs", "~> 1.3"
 gem "base32-url", "~> 0.3"
 gem "batch-loader", "~> 1.4", ">= 1.4.1"
 gem "bcrypt", "~> 3.1.7"
-gem "bolognese", "~> 1.11.5"
+# gem "bolognese", "~> 1.11.5"
+gem "bolognese", git: "https://github.com/datacite/bolognese", branch: "schema-4.5"
 gem "bootsnap", "~> 1.4", ">= 1.4.4", require: false
 gem "cancancan", "~> 3.0"
 gem "commonmarker", "~> 0.23.4"

Gemfile.lock

@@ -1,3 +1,33 @@
+GIT
+  remote: https://github.com/datacite/bolognese
+  revision: 98870f13479ef266a4b773e5295958886252a5a8
+  branch: schema-4.5
+  specs:
+    bolognese (1.11.5)
+      activesupport (>= 4.2.5)
+      benchmark_methods (~> 0.7)
+      bibtex-ruby (>= 5.1.0)
+      builder (~> 3.2, >= 3.2.2)
+      citeproc-ruby (~> 1.1, >= 1.1.12)
+      colorize (~> 0.8.1)
+      concurrent-ruby (~> 1.1, >= 1.1.5)
+      csl-styles (~> 1.0, >= 1.0.1.10)
+      edtf (~> 3.0, >= 3.0.4)
+      gender_detector (~> 0.1.2)
+      iso8601 (~> 0.9.1)
+      json-ld-preloaded (~> 3.1, >= 3.1.3)
+      jsonlint (~> 0.3.0)
+      loofah (~> 2.0, >= 2.0.3)
+      maremma (>= 4.9.4, < 5)
+      namae (~> 1.0)
+      nokogiri (>= 1.13.2, < 1.14)
+      oj (~> 3.10)
+      oj_mimic_json (~> 1.0, >= 1.0.1)
+      postrank-uri (~> 1.0, >= 1.0.18)
+      rdf-rdfxml (~> 3.1)
+      rdf-turtle (~> 3.1)
+      thor (>= 0.19)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -113,30 +143,6 @@ GEM
       latex-decode (~> 0.0)
     binding_of_caller (1.0.0)
       debug_inspector (>= 0.0.1)
-    bolognese (1.11.5)
-      activesupport (>= 4.2.5)
-      benchmark_methods (~> 0.7)
-      bibtex-ruby (>= 5.1.0)
-      builder (~> 3.2, >= 3.2.2)
-      citeproc-ruby (~> 1.1, >= 1.1.12)
-      colorize (~> 0.8.1)
-      concurrent-ruby (~> 1.1, >= 1.1.5)
-      csl-styles (~> 1.0, >= 1.0.1.10)
-      edtf (~> 3.0, >= 3.0.4)
-      gender_detector (~> 0.1.2)
-      iso8601 (~> 0.9.1)
-      json-ld-preloaded (~> 3.1, >= 3.1.3)
-      jsonlint (~> 0.3.0)
-      loofah (~> 2.0, >= 2.0.3)
-      maremma (>= 4.9.4, < 5)
-      namae (~> 1.0)
-      nokogiri (>= 1.13.2, < 1.14)
-      oj (~> 3.10)
-      oj_mimic_json (~> 1.0, >= 1.0.1)
-      postrank-uri (~> 1.0, >= 1.0.18)
-      rdf-rdfxml (~> 3.1)
-      rdf-turtle (~> 3.1)
-      thor (>= 0.19)
     bootsnap (1.15.0)
       msgpack (~> 1.2)
     builder (3.2.4)
@@ -656,7 +662,7 @@ DEPENDENCIES
   bcrypt (~> 3.1.7)
   better_errors
   binding_of_caller
-  bolognese (~> 1.11.5)
+  bolognese!
   bootsnap (~> 1.4, >= 1.4.4)
   bullet (~> 6.1)
   byebug
@@ -749,4 +755,4 @@ DEPENDENCIES
   webmock (~> 3.1)
 
 BUNDLED WITH
-   2.4.10
+   2.4.20

app/controllers/activities_controller.rb

@@ -69,6 +69,9 @@ def index
             end,
         }.compact
         options[:is_collection] = true
+        options[:params] = {
+          publisher: params[:publisher],
+        }
 
         render json: ActivitySerializer.new(results, options).serialized_json,
                status: :ok
@@ -105,6 +108,9 @@ def index
         }.compact
         options[:include] = @include
         options[:is_collection] = true
+        options[:params] = {
+          publisher: params[:publisher],
+        }
 
         render json: ActivitySerializer.new(results, options).serialized_json,
                status: :ok
@@ -129,6 +135,9 @@ def show
     options = {}
     options[:include] = @include
     options[:is_collection] = false
+    options[:params] = {
+      publisher: params[:publisher],
+    }
 
     render json: ActivitySerializer.new(@activity, options).serialized_json,
            status: :ok

app/controllers/datacite_dois_controller.rb

@@ -196,6 +196,7 @@ def index
           current_ability: current_ability,
           detail: params[:detail],
           affiliation: params[:affiliation],
+          publisher: params[:publisher],
           is_collection: options[:is_collection],
         }
 
@@ -339,6 +340,7 @@ def index
                       detail: params[:detail],
                       composite: params[:composite],
                       affiliation: params[:affiliation],
+                      publisher: params[:publisher],
                       # The cursor link should be an array of values, but we want to encode it into a single string for the URL
                       "page[cursor]" =>
                         page[:cursor] ? make_cursor(results) : nil,
@@ -359,6 +361,7 @@ def index
               detail: params[:detail],
               composite: params[:composite],
               affiliation: params[:affiliation],
+              publisher: params[:publisher],
               is_collection: options[:is_collection],
             }
 
@@ -459,6 +462,7 @@ def show
           detail: true,
           composite: nil,
           affiliation: params[:affiliation],
+          publisher: params[:publisher],
         }
 
         render json: DataciteDoiSerializer.new(doi, options).serialized_json,
@@ -511,7 +515,11 @@ def validate
       options = {}
       options[:include] = @include
       options[:is_collection] = false
-      options[:params] = { current_ability: current_ability }
+      options[:params] = {
+        current_ability: current_ability,
+        affiliation: params[:affiliation],
+        publisher: params[:publisher]
+      }
 
       render json: DataciteDoiSerializer.new(@doi, options).serialized_json,
              status: :ok
@@ -539,6 +547,7 @@ def create
         current_ability: current_ability,
         detail: true,
         affiliation: params[:affiliation],
+        publisher: params[:publisher],
       }
 
       render json: DataciteDoiSerializer.new(@doi, options).serialized_json,
@@ -597,6 +606,7 @@ def update
         current_ability: current_ability,
         detail: true,
         affiliation: params[:affiliation],
+        publisher: params[:publisher],
       }
 
       render json: DataciteDoiSerializer.new(@doi, options).serialized_json,

app/graphql/types/doi_item.rb

@@ -579,6 +579,17 @@ def identifiers
     end
   end
 
+  def publisher
+    case object.publisher
+    when Hash
+      object.publisher["name"]
+    when String
+      object.publisher
+    else
+      object.publisher
+    end
+  end
+
   def bibtex
     pages =
       if object.container.to_h["firstPage"].present?
@@ -909,7 +920,7 @@ def citeproc_hsh
       "volume" => object.container.to_h["volume"],
       "issue" => object.container.to_h["issue"],
       "page" => page,
-      "publisher" => object.publisher,
+      "publisher" => object.publisher["name"] || object.publisher,
       "title" => parse_attributes(object.titles, content: "title", first: true),
       "URL" => object.url,
       "version" => object.version_info,

app/jobs/doi_convert_publisher_by_id_job.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class DoiConvertPublisherByIdJob < ApplicationJob
+  queue_as :lupo_background
+
+  rescue_from ActiveJob::DeserializationError,
+              Elasticsearch::Transport::Transport::Errors::BadRequest do |error|
+    Rails.logger.error error.message
+  end
+
+  def perform(options = {})
+    Doi.convert_publisher_by_id(options)
+  end
+end

app/lib/params_sanitizer.rb

@@ -35,6 +35,15 @@ class ParamsSanitizer
     :titles,
     { titles: %i[title titleType lang] },
     :publisher,
+      {
+        publisher: %i[
+          name
+          publisherIdentifier
+          publisherIdentifierScheme
+          schemeUri
+          lang
+        ],
+      },
     :publicationYear,
     :created,
     :prefix,