commonmeta-ruby 3.0.2 → 3.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9b9a5c37f7800cb3eeee4bbe8a343562b5c3ea466a0fec8621af95c5132f749
-  data.tar.gz: c50ad3cda6d44ee2f1e513c4e6ba36adb829d95bd2c07eb6e76b86f8ebbf2ddb
+  metadata.gz: a7dd4130cd421b4e718c9d7ca6e407ff77eb58f10986091baa4dbf1403a0dafc
+  data.tar.gz: 2874c557642143804692c1702bd0487df4b4d73406af8380b445f01a77e00cde
 SHA512:
-  metadata.gz: 1a3afb6655cef3dfc742e826ae43ff1cde17e8d852b9d2c3c465cd5a9ac8c1c8480dd0e81a888561acc4ea311dfd7968a150c2dabd04b09bb77dcef47632252d
-  data.tar.gz: dc70555987515a2193c7dec735395fef12d9fa71ce9f1d70a621404ce947e2c8ec09f53c92fa5b7785a675e54d6854ab4b1674bb612514b21481548a873dcad9
+  metadata.gz: 062e9794c287d3dbde5d47f1397ba9e52a33be50d6163bac7d33843390a3d7a9855b976aa438853a8844a8980bc2b8e83568332f386f7496e8d6abb434635bb5
+  data.tar.gz: db93cb2e83be946d89ccae9ed6c13103b2d971af7155734f94750194d3f423a6747b629af03bbae40e45200b1185b383e28d104f316de838669210c1c366c1eb

data/.gitignore

@@ -10,9 +10,6 @@
 /test/version_tmp/
 /tmp/
 
-# Used by dotenv library to load environment variables.
-# .env
-
 ## Specific to RubyMotion:
 .dat*
 .repl_history
@@ -50,10 +47,6 @@ build-iPhoneSimulator/
 .rvmrc
 
 coverage/
-.env
-.env.*
-!.env.example
-!.env.travis
 
 .vscode
 .dccache

data/Gemfile.lock

@@ -1,14 +1,13 @@
 PATH
   remote: .
   specs:
-    commonmeta-ruby (3.0.2)
+    commonmeta-ruby (3.0.4)
       activesupport (>= 4.2.5, < 8.0)
       base32-url (>= 0.5.0, < 1)
       bibtex-ruby (~> 6.0)
       builder (~> 3.2, >= 3.2.4)
       citeproc-ruby (~> 2.0)
       csl-styles (~> 2.0)
-      dotenv (~> 2.1, >= 2.1.1)
       edtf (~> 3.0, >= 3.0.4)
       gender_detector (~> 2.0)
       http (~> 5.1, >= 5.1.1)
@@ -18,7 +17,6 @@ PATH
       loofah (~> 2.19)
       namae (~> 1.0)
       postrank-uri (~> 1.1)
-      public_suffix (~> 4.0, >= 4.0.7)
       rdf-rdfxml (~> 3.2)
       rdf-turtle (~> 3.2)
       thor (~> 1.1, >= 1.1.0)
@@ -58,7 +56,6 @@ GEM
     docile (1.4.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    dotenv (2.8.1)
     ebnf (2.3.2)
       htmlentities (~> 4.3)
       rdf (~> 3.2)

data/commonmeta.gemspec

@@ -24,7 +24,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'builder', '~> 3.2', '>= 3.2.4'
   s.add_dependency 'citeproc-ruby', '~> 2.0'
   s.add_dependency 'csl-styles', '~> 2.0'
-  s.add_dependency 'dotenv', '~> 2.1', '>= 2.1.1'
   s.add_dependency 'edtf', '~> 3.0', '>= 3.0.4'
   s.add_dependency 'gender_detector', '~> 2.0'
   s.add_dependency 'http', '~> 5.1', '>= 5.1.1'
@@ -34,7 +33,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'loofah', '~> 2.19'
   s.add_dependency 'namae', '~> 1.0'
   s.add_dependency 'postrank-uri', '~> 1.1'
-  s.add_dependency 'public_suffix', '~> 4.0', '>= 4.0.7'
   s.add_dependency 'rdf-rdfxml', '~> 3.2'
   s.add_dependency 'rdf-turtle', '~> 3.2'
   s.add_dependency 'thor', '~> 1.1', '>= 1.1.0'

data/lib/commonmeta/cli.rb

@@ -41,6 +41,7 @@ module Commonmeta
                               style: options[:style],
                               locale: options[:locale],
                               show_errors: options[:show_errors],
+                              doi: options[:doi],
                               depositor: options[:depositor],
                               email: options[:email],
                               registrant: options[:registrant])

data/lib/commonmeta/crossref_utils.rb

@@ -2,9 +2,8 @@
 
 module Commonmeta
   module CrossrefUtils
-    # To configure the writing of Crossref metadata, use environmental
-    # variables CROSSREF_DEPOSITOR_NAME, CROSSREF_DEPOSITOR_EMAIL and CROSSREF_REGISTRANT,
-    # e.g. in a .env file
+    # To configure the writing of Crossref metadata, provide the following variables
+    # depositor, email, and registrant
     def write_crossref_xml
       @crossref_xml ||= Nokogiri::XML::Builder.new(encoding: 'UTF-8') do |xml|
         xml.doi_batch(crossref_root_attributes) do
@@ -13,10 +12,10 @@ module Commonmeta
             xml.doi_batch_id(SecureRandom.uuid)
             xml.timestamp(Time.now.utc.strftime('%Y%m%d%H%M%S'))
             xml.depositor do
-              xml.depositor_name(ENV.fetch('CROSSREF_DEPOSITOR_NAME', nil))
-              xml.email_address(ENV.fetch('CROSSREF_DEPOSITOR_EMAIL', nil))
+              xml.depositor_name(depositor)
+              xml.email_address(email)
             end
-            xml.registrant(ENV.fetch('CROSSREF_REGISTRANT', nil))
+            xml.registrant(registrant)
           end
           xml.body do
             insert_crossref_work(xml)

data/lib/commonmeta/metadata.rb

@@ -157,9 +157,9 @@ module Commonmeta
     end
 
     # Catch errors in the reader
-    # Then validate against JSON schema for DataCite v4
+    # Then validate against JSON schema for Commonmeta
     def errors
-      meta.fetch('errors', nil) || json_schema_errors(schema_version: schema_version)
+      meta.fetch('errors', nil) || json_schema_errors
     end
 
     def descriptions

data/lib/commonmeta/schema_utils.rb

@@ -1,16 +1,14 @@
 # frozen_string_literal: true
 
-require 'json_schemer'
-require 'pathname'
+require "json_schemer"
+require "pathname"
 
 module Commonmeta
   module SchemaUtils
-    # DATACITE_V3 = schema = File.read(File.expand_path("../../resources/datacite-v3.json", __dir__))
-    # DATACITE_V4 = schema = File.read(File.expand_path("../../resources/datacite-v4.json", __dir__))
-    COMMONMETA = schema = File.read(File.expand_path('../../resources/commonmeta_v0.9.json',
-                                                     __dir__))
+    COMMONMETA = File.read(File.expand_path("../../resources/commonmeta_v0.9.1.json",
+                                            __dir__))
 
-    def json_schema_errors(schema_version: nil)
+    def json_schema_errors
       schemer = JSONSchemer.schema(COMMONMETA)
       errors = schemer.validate(meta).to_a
       errors.map { |err| JSONSchemer::Errors.pretty err }.presence

data/lib/commonmeta/utils.rb

@@ -1337,9 +1337,12 @@ module Commonmeta
     end
 
     def encode_doi(prefix)
-      random_int = SecureRandom.random_number(2**63..(2**64) - 1)
-      suffix = Base32::URL.encode(random_int)
-      str = "#{suffix[0, 7]}-#{suffix[6, 7]}"
+      # DOI suffix is a generated from a random number, encoded in base32
+      # suffix has 8 digits plus two checksum digits. With base32 there are 
+      # 32 possible digits, so 8 digits gives 32^8 possible combinations
+      random_int = SecureRandom.random_number(32**7..(32**8) - 1)
+      suffix = Base32::URL.encode(random_int, checksum: true)
+      str = "#{suffix[0, 5]}-#{suffix[5, 10]}"
       "https://doi.org/#{prefix}/#{str}"
     end
 

data/lib/commonmeta/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Commonmeta
-  VERSION = '3.0.2'
+  VERSION = '3.0.4'
 end

data/lib/commonmeta.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'dotenv/load'
 require 'active_support/all'
 require 'nokogiri'
 ActiveSupport::XmlMini.backend = 'Nokogiri'

data/resources/{commonmeta_v0.9.json → commonmeta_v0.9.1.json}

@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://commonmeta.org/commonmeta_v0.9.json",
-  "title": "Commonmeta v0.9",
+  "$id": "https://commonmeta.org/commonmeta_v0.9.1.json",
+  "title": "Commonmeta v0.9.1",
   "description": "JSON representation of the Commonmeta schema.",
   "additionalProperties": false,
   "definitions": {
@@ -17,11 +17,21 @@
       },
       "uniqueItems": true
     },
+    "latitude": {
+      "type": "number",
+      "minimum": -90,
+      "maximum": 90
+    },
+    "longitude": {
+      "type": "number",
+      "minimum": -180,
+      "maximum": 180
+    },
     "geoLocationPoint": {
       "type": "object",
       "properties": {
-        "pointLongitude": { "type": "string", "format": "longitude" },
-        "pointLatitude": { "type": "string", "format": "latitude" }
+        "pointLongitude": { "$ref": "#/definitions/longitude" },
+        "pointLatitude": { "$ref": "#/definitions/latitude" }
       },
       "required": ["pointLongitude", "pointLatitude"]
     }
@@ -318,10 +328,10 @@
           "geoLocationBox": {
             "type": "object",
             "properties": {
-              "westBoundLongitude": { "type": "string", "format": "longitude" },
-              "eastBoundLongitude": { "type": "string", "format": "longitude" },
-              "southBoundLatitude": { "type": "string", "format": "latitude" },
-              "northBoundLatitude": { "type": "string", "format": "latitude" }
+              "westBoundLongitude": { "$ref": "#/definitions/longitude" },
+              "eastBoundLongitude": { "$ref": "#/definitions/longitude" },
+              "southBoundLatitude": { "$ref": "#/definitions/latitude" },
+              "northBoundLatitude": { "$ref": "#/definitions/latitude" }
             },
             "required": [
               "westBoundLongitude",

data/spec/utils_spec.rb

@@ -612,8 +612,8 @@ describe Commonmeta::Metadata, vcr: true do
     it 'encode doi' do
       prefix = '10.53731'
       response = subject.encode_doi(prefix)
-      expect(response).to match(%r{#{prefix}/[-._;()/:A-Za-z0-9]+})
-      expect(response.length).to eq(40)
+      expect(response).to match(%r{#{prefix}/[a-z0-9]+})
+      expect(response.length).to eq(36)
     end
 
     it 'decode doi' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: commonmeta-ruby
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.4
 platform: ruby
 authors:
 - Martin Fenner
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-20 00:00:00.000000000 Z
+date: 2023-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -112,26 +112,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: dotenv
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.1.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.1.1
 - !ruby/object:Gem::Dependency
   name: edtf
   requirement: !ruby/object:Gem::Requirement
@@ -276,26 +256,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: public_suffix
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.0.7
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.0.7
 - !ruby/object:Gem::Dependency
   name: rdf-rdfxml
   requirement: !ruby/object:Gem::Requirement
@@ -640,7 +600,7 @@ files:
 - lib/commonmeta/xml_converter.rb
 - resources/2008/09/xsd.xsl
 - resources/cff.json
-- resources/commonmeta_v0.9.json
+- resources/commonmeta_v0.9.1.json
 - resources/crossref/AccessIndicators.xsd
 - resources/crossref/JATS-journalpublishing1-3d2-mathml3-elements.xsd
 - resources/crossref/JATS-journalpublishing1-3d2-mathml3.xsd