datacite 0.8.5 → 0.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00f41bdc53e8f7aaa02f9f09e1dfe88edf480c12227f76fd8119b1ec261db326
-  data.tar.gz: f99aa687067a3b5ed223916e1a10b52e14c2ccce291f79369db3308646034865
+  metadata.gz: 3c6e93694a50948fc866ff336b901d882eb32ed9e8ab689aca895270daab30b3
+  data.tar.gz: 9bfc9dd9beacc558d1eab99409683e822eaa3bceec7c87717a5da3230d3138f8
 SHA512:
-  metadata.gz: 59c3b1b903a6b0288816db41213e6c0201863b8f94acf411e8851edd9717f14c1f4f3e54dd7ddfceeec762f113ff77d203b74971bee596ad22a916162dc0c49c
-  data.tar.gz: ffa85b5ecf4d3042f98b3565ae4105ce08ef1c065fc622e5f38392cccd7e7548773344fa46d9ae4202f399ff848289420b04c79b4810ea949aa870de71d249ce
+  metadata.gz: e15137bf19fcd271271641e599caf1a269e14edebfb6e38e34175991718f9db31d2c7eb4a9f03ffbd1cac7eb4df3cdb8db3f83a76fe4fa29d77bf57a08eb898f
+  data.tar.gz: 02b7c106976d1a54348f6c389726bc623b3d6a65a20ceb226d564c822f6c667ceb6145441bc249d1553e4002bde17ad9ba4ff941419b72fa7098edd721306dc0

data/.circleci/config.yml

@@ -1,6 +1,6 @@
 version: 2.1
 orbs:
-  ruby-rails: sul-dlss/ruby-rails@4.12.0
+  ruby-rails: sul-dlss/ruby-rails@5.0.0
 workflows:
   build:
     jobs:

data/.rubocop.yml

@@ -3,7 +3,12 @@ plugins:
   - rubocop-rspec
 
 AllCops:
-  TargetRubyVersion: 3.4
+  TargetRubyVersion: 4.0
+
+# Development uses Ruby 4, but the gem still supports Ruby 3.4 consumers.
+Gemspec/RequiredRubyVersion:
+  Exclude:
+    - datacite.gemspec
 
 Metrics/BlockLength:
   Exclude:
@@ -357,3 +362,59 @@ Style/RedundantArrayFlatten: # new in 1.76
   Enabled: true
 RSpec/IncludeExamples: # new in 3.6
   Enabled: true
+
+Lint/DataDefineOverride: # new in 1.85
+  Enabled: true
+Lint/DeprecatedReference: # new in 1.89
+  Enabled: true
+Lint/NameTypo: # new in 1.89
+  Enabled: true
+Lint/UnreachablePatternBranch: # new in 1.85
+  Enabled: true
+Style/EmptyClassDefinition: # new in 1.84
+  Enabled: true
+Style/FileOpen: # new in 1.85
+  Enabled: true
+Style/MapJoin: # new in 1.85
+  Enabled: true
+Style/ModuleMemberExistenceCheck: # new in 1.82
+  Enabled: true
+Style/NegativeArrayIndex: # new in 1.84
+  Enabled: true
+Style/OneClassPerFile: # new in 1.85
+  Enabled: true
+Style/PartitionInsteadOfDoubleSelect: # new in 1.85
+  Enabled: true
+Style/PredicateWithKind: # new in 1.85
+  Enabled: true
+Style/ReduceToHash: # new in 1.85
+  Enabled: true
+Style/RedundantMinMaxBy: # new in 1.85
+  Enabled: true
+Style/ReverseFind: # new in 1.84
+  Enabled: true
+Style/SelectByKind: # new in 1.85
+  Enabled: true
+Style/SelectByRange: # new in 1.85
+  Enabled: true
+Style/TallyMethod: # new in 1.85
+  Enabled: true
+RSpec/DiscardedMatcher: # new in 3.10
+  Enabled: true
+RSpec/LeakyLocalVariable: # new in 3.8
+  Enabled: true
+RSpec/MatchWithSimpleRegex: # new in 3.10
+  Enabled: true
+RSpec/Output: # new in 3.9
+  Enabled: true
+
+Lint/ArgumentMismatch: # new in 1.90
+  Enabled: true
+Lint/MisplacedMagicComment: # new in 1.91
+  Enabled: true
+Lint/SuperArgumentMismatch: # new in 1.90
+  Enabled: true
+Style/DirectiveScope: # new in 1.90
+  Enabled: true
+Style/TimeNow: # new in 1.90
+  Enabled: true

data/Gemfile

@@ -6,13 +6,12 @@ source 'https://rubygems.org'
 gemspec
 
 # Specify development dependencies here
-gem 'base64'
 gem 'cocina-models' # only used in tests
 gem 'debug'
-gem 'rake', '~> 13.0'
-gem 'rspec', '~> 3.0'
-gem 'rubocop', '~> 1.7'
+gem 'rake'
+gem 'rspec'
+gem 'rubocop'
 gem 'rubocop-rake'
 gem 'rubocop-rspec'
 gem 'simplecov'
-gem 'webmock', '~> 3.13'
+gem 'webmock'

data/Gemfile.lock

@@ -1,17 +1,20 @@
 PATH
   remote: .
   specs:
-    datacite (0.8.5)
+    datacite (0.8.7)
       activesupport
-      dry-monads (~> 1.3)
-      faraday (~> 2.0)
+      base64
+      cocina_display
+      dry-monads
+      faraday
+      json
       json_schemer
-      zeitwerk (~> 2.4)
+      zeitwerk
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (8.1.3.1)
+    activesupport (8.1.4)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.3.1)
@@ -29,7 +32,7 @@ GEM
     ast (2.4.3)
     attr_extras (7.1.0)
     base64 (0.3.0)
-    bigdecimal (4.1.2)
+    bigdecimal (4.1.3)
     cocina-models (0.133.0)
       activesupport
       cocina_display
@@ -44,7 +47,7 @@ GEM
       super_diff
       thor
       zeitwerk (~> 2.1)
-    cocina_display (2.10.0)
+    cocina_display (2.14.0)
       activesupport (>= 7)
       edtf (~> 3.2)
       geo_coord (~> 0.2)
@@ -74,7 +77,7 @@ GEM
       concurrent-ruby (~> 1.0)
       dry-core (~> 1.1)
       zeitwerk (~> 2.6)
-    dry-monads (1.10.0)
+    dry-monads (1.11.0)
       concurrent-ruby (~> 1.0)
       dry-core (~> 1.1)
       zeitwerk (~> 2.6)
@@ -95,11 +98,11 @@ GEM
     equivalent-xml (0.6.0)
       nokogiri (>= 1.4.3)
     erb (6.0.7)
-    faraday (2.14.3)
-      faraday-net_http (>= 2.0, < 3.5)
+    faraday (2.15.0)
+      faraday-net_http (>= 2.0, < 3.6)
       json
       logger
-    faraday-net_http (3.4.4)
+    faraday-net_http (3.5.0)
       net-http (~> 0.5)
     geo_coord (0.2.0)
     hana (1.3.7)
@@ -107,34 +110,34 @@ GEM
     i18n (1.15.2)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
-    io-console (0.9.2)
+    io-console (0.9.4)
     irb (1.18.0)
       pp (>= 0.6.0)
       prism (>= 1.3.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     iso8601 (0.13.0)
-    janeway-jsonpath (1.1.0)
+    janeway-jsonpath (1.2.0)
     json (2.21.2)
     json_schemer (2.5.0)
       bigdecimal
       hana (~> 1.3)
       regexp_parser (~> 2.0)
       simpleidn (~> 0.2)
-    jsonschema_rs (0.49.9)
+    jsonschema_rs (0.60.1)
       bigdecimal (>= 3.1, < 5)
-      rb_sys (~> 0.9.124)
-    jsonschema_rs (0.49.9-aarch64-linux)
+      rb_sys (~> 0.9.130)
+    jsonschema_rs (0.60.1-aarch64-linux)
       bigdecimal (>= 3.1, < 5)
-    jsonschema_rs (0.49.9-aarch64-linux-musl)
+    jsonschema_rs (0.60.1-aarch64-linux-musl)
       bigdecimal (>= 3.1, < 5)
-    jsonschema_rs (0.49.9-arm64-darwin)
+    jsonschema_rs (0.60.1-arm64-darwin)
       bigdecimal (>= 3.1, < 5)
-    jsonschema_rs (0.49.9-x86_64-darwin)
+    jsonschema_rs (0.60.1-x86_64-darwin)
       bigdecimal (>= 3.1, < 5)
-    jsonschema_rs (0.49.9-x86_64-linux)
+    jsonschema_rs (0.60.1-x86_64-linux)
       bigdecimal (>= 3.1, < 5)
-    jsonschema_rs (0.49.9-x86_64-linux-musl)
+    jsonschema_rs (0.60.1-x86_64-linux-musl)
       bigdecimal (>= 3.1, < 5)
     language_server-protocol (3.17.0.6)
     lint_roller (1.1.0)
@@ -142,8 +145,11 @@ GEM
     minitest (6.0.6)
       drb (~> 2.0)
       prism (~> 1.5)
-    net-http (0.9.1)
+    net-http (0.10.0)
+      net-protocol (>= 0.3.0)
       uri (>= 0.11.1)
+    net-protocol (0.4.0)
+      timeout
     nokogiri (1.19.4-aarch64-linux-gnu)
       racc (~> 1.4)
     nokogiri (1.19.4-aarch64-linux-musl)
@@ -161,33 +167,33 @@ GEM
     nokogiri (1.19.4-x86_64-linux-musl)
       racc (~> 1.4)
     optimist (3.2.1)
-    parallel (2.1.0)
-    parser (3.3.12.0)
+    parallel (2.3.0)
+    parser (3.3.13.0)
       ast (~> 2.4.1)
       racc
     patience_diff (1.2.0)
       optimist (~> 3.0)
     pp (0.6.4)
       prettyprint
-    prettyprint (0.2.0)
+    prettyprint (0.2.1)
     prism (1.9.0)
     public_suffix (7.0.5)
     racc (1.8.1)
     rainbow (3.1.1)
     rake (13.4.2)
     rake-compiler-dock (1.12.0)
-    rb_sys (0.9.128)
+    rb_sys (0.9.130)
       rake-compiler-dock (= 1.12.0)
-    rbs (4.1.3)
+    rbs (4.2.0)
       logger
       prism (>= 1.6.0)
       tsort
-    rdoc (8.0.0)
+    rdoc (8.1.0)
       erb
       prism (>= 1.6.0)
       rbs (>= 4.0.0)
       tsort
-    regexp_parser (2.12.0)
+    regexp_parser (2.13.1)
     reline (0.7.0)
       io-console (~> 0.5)
     rexml (3.4.4)
@@ -204,14 +210,14 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.7)
-    rubocop (1.89.0)
-      json (~> 2.3)
+    rubocop (1.92.1)
+      json (>= 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
       parallel (>= 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 2.9.3, < 3.0)
+      regexp_parser (>= 2.11.3, < 3.0)
       rubocop-ast (>= 1.49.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
@@ -227,21 +233,22 @@ GEM
       rubocop (~> 1.86, >= 1.86.2)
     ruby-progressbar (1.13.0)
     securerandom (0.4.1)
-    simplecov (1.0.3)
-    simpleidn (0.2.3)
+    simplecov (1.3.2)
+    simpleidn (0.3.0)
     super_diff (0.19.0)
       attr_extras (>= 6.2.4, < 8)
       diff-lcs (~> 1.5)
       patience_diff (~> 1.2)
     thor (1.5.0)
+    timeout (0.6.1)
     tsort (0.2.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (3.2.0)
-      unicode-emoji (~> 4.1)
-    unicode-emoji (4.2.0)
-    uri (1.1.1)
-    webmock (3.26.2)
+    unicode-display_width (3.3.0)
+      unicode-emoji (~> 4.3)
+    unicode-emoji (4.3.0)
+    uri (1.1.2)
+    webmock (3.34.0)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -258,17 +265,16 @@ PLATFORMS
   x86_64-linux-musl
 
 DEPENDENCIES
-  base64
   cocina-models
   datacite!
   debug
-  rake (~> 13.0)
-  rspec (~> 3.0)
-  rubocop (~> 1.7)
+  rake
+  rspec
+  rubocop
   rubocop-rake
   rubocop-rspec
   simplecov
-  webmock (~> 3.13)
+  webmock
 
 BUNDLED WITH
-  4.0.18
+  4.0.23

data/README.md

@@ -127,8 +127,20 @@ bin/validate-cocina path/to/file.json
 
 This will result in either a `Valid!` message or an `Invalid!` message with a list of validation errors.
 
+## Transforming cocina locally
+
+With cocina json saved from Argo (append `.json` to an Argo view URL and save the content locally) then run:
+
+```
+bin/transform path/to/file.json
+```
+
+This will output the formatted json content that would be sent to DataCite.
+
 ## Development
 
+Use Ruby 4.0.7 for development and testing.
+
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and the created tag, and push the `.gem` file to [rubygems.org](https://rubygems.org).

data/bin/transform

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+# This is used to review the transformation of a cocina object
+# to a datacite payload
+# usage: bin/transform tmp/druid.json
+
+require 'bundler/setup'
+require 'datacite'
+require 'cocina/models'
+require 'json'
+
+if ARGV.empty?
+  warn "Usage: #{$PROGRAM_NAME} <path-to-cocina-json>"
+  exit 1
+end
+
+json_path = ARGV[0]
+
+unless File.exist?(json_path)
+  warn "File not found: #{json_path}"
+  exit 1
+end
+
+json = JSON.parse(File.read(json_path))
+cocina_object = Cocina::Models::DROWithMetadata.new(json)
+attributes = Datacite::Mapping::FromCocina::Attributes.build(cocina_object:)
+
+puts JSON.pretty_generate(attributes)

data/datacite.gemspec

@@ -29,9 +29,12 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'activesupport'
-  spec.add_dependency 'dry-monads', '~> 1.3'
-  spec.add_dependency 'faraday', '~> 2.0'
+  spec.add_dependency 'base64'
+  spec.add_dependency 'cocina_display'
+  spec.add_dependency 'dry-monads'
+  spec.add_dependency 'faraday'
+  spec.add_dependency 'json'
   spec.add_dependency 'json_schemer'
-  spec.add_dependency 'zeitwerk', '~> 2.4'
+  spec.add_dependency 'zeitwerk'
   spec.metadata['rubygems_mfa_required'] = 'true'
 end

data/lib/datacite/mapping/from_cocina/attributes.rb

@@ -30,7 +30,7 @@ module Datacite
             event: 'publish',
             url: description.purl,
             identifiers: Identifiers.build(identification:),
-            titles: Titles.build(description:),
+            titles: Titles.build(title: cocina_display.full_title),
             publisher: { name: 'Stanford Digital Repository' }, # per DataCite schema
             publicationYear: publication_year,
             subjects: Subject.build(description:),
@@ -46,6 +46,10 @@ module Datacite
           }.merge(ContributorAttributes.build(description:)).compact
         end
 
+        def cocina_display
+          @cocina_display ||= CocinaDisplay::CocinaRecord.from_json(cocina_object.to_json)
+        end
+
         private
 
         def publication_year

data/lib/datacite/mapping/from_cocina/related_resource.rb

@@ -110,8 +110,8 @@ module Datacite
         end
 
         def related_item_title
-          @related_item_title ||= preferred_citation || other_title \
-            || related_item_doi || related_item_arxiv || related_item_pmid \
+          @related_item_title ||= preferred_citation || other_title
+            || related_item_doi || related_item_arxiv || related_item_pmid
             || related_item_identifier_url
         end
 

data/lib/datacite/mapping/from_cocina/titles.rb

@@ -13,19 +13,19 @@ module Datacite
           new(...).call
         end
 
-        def initialize(description:)
-          @description = description
+        def initialize(title:)
+          @title = title
         end
 
         # @return [Array<Hash>] list of titles for DataCite, conforming to the expectations of HTTP PUT request
         # to DataCite
         def call
-          [{ title: description.title.first.value }]
+          [{ title: }]
         end
 
         private
 
-        attr_reader :description
+        attr_reader :title
       end
     end
   end

data/lib/datacite/validators/attributes_validator.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'json_schemer'
-require 'pathname'
 
 module Datacite
   module Validators

data/lib/datacite/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Datacite
-  VERSION = '0.8.5'
+  VERSION = '0.8.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: datacite
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.8.7
 platform: ruby
 authors:
 - Justin Coyne
@@ -23,34 +23,76 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: base64
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: cocina_display
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: dry-monads
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: json_schemer
   requirement: !ruby/object:Gem::Requirement
@@ -69,16 +111,16 @@ dependencies:
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '0'
 description: See https://support.datacite.org/docs/api
 email:
 - jcoyne@justincoyne.com
@@ -98,6 +140,7 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- bin/transform
 - bin/validate-cocina
 - datacite.gemspec
 - lib/datacite.rb
@@ -141,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.20
 specification_version: 4
 summary: A Ruby client library for the DataCite REST API
 test_files: []