commonmeta-ruby 3.0.5 → 3.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c95cbf53a27529abcef8b642be1808abe1ef14e0743e3659e034c56a63391c44
-  data.tar.gz: dd32ed83707428d77f567d3810f7581cdffe49493afa58b2a83d7ee36189ebee
+  metadata.gz: a8554b09a4a7efef4be8b21703eec6013c56b679b3cd84b1c82f1e3c7c8747ae
+  data.tar.gz: cb597fd50b0ba17d9e379344aa2c84647e0eb32829676def9e63356bdb415a4c
 SHA512:
-  metadata.gz: 925069193052d9443ae9af6f1f91e0a96d9cf4cc67c7717f08fad06c4f24a9725c654db67036f4a2a644dcbec9f578924838483d541830059a42e3ee3bf0dfc1
-  data.tar.gz: 8b7fa15309cfa4eeb2333c5ac1b40c1b872df06e5f7bdfe988959900f11a2b3f8ccd7e797e68439c12d0709a0257b26590a7ddcee58915998f529c40fbc60b35
+  metadata.gz: 2e4907bf337d9296440b40fbeaa6d97f2da4125f83b649db9787d1e220ee70d53d1dcf57739e2dcf0653b01261f512291e34ba4d4905fbf7f59864878daa90ad
+  data.tar.gz: 9328e0618e95c59dc8e2e0d61238fc2a2de9cc0cd2210619e5a797f0742d26d4360e2cecdb47ac318f749f073b5a8919606773f16398df61fc983c016c247922

data/.gitignore

@@ -10,6 +10,9 @@
 /test/version_tmp/
 /tmp/
 
+# Used by dotenv library to load environment variables.
+.env
+
 ## Specific to RubyMotion:
 .dat*
 .repl_history

data/Gemfile.lock

@@ -1,13 +1,15 @@
 PATH
   remote: .
   specs:
-    commonmeta-ruby (3.0.5)
+    commonmeta-ruby (3.0.7)
       activesupport (>= 4.2.5, < 8.0)
+      addressable (~> 2.8.1, < 2.8.2)
       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)
@@ -56,6 +58,7 @@ 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)
@@ -71,8 +74,9 @@ GEM
       ffi (>= 1.0.0)
       rake
     gender_detector (2.0.0)
-    haml (5.2.2)
-      temple (>= 0.8.0)
+    haml (6.1.1)
+      temple (>= 0.8.2)
+      thor
       tilt
     hana (1.3.7)
     hashdiff (1.0.1)
@@ -112,7 +116,7 @@ GEM
     llhttp-ffi (0.4.0)
       ffi-compiler (~> 1.0)
       rake (~> 13.0)
-    loofah (2.19.1)
+    loofah (2.20.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     matrix (0.4.2)
@@ -124,7 +128,7 @@ GEM
     oj (3.14.2)
     optimist (3.0.1)
     parallel (1.22.1)
-    parser (3.2.1.1)
+    parser (3.2.2.0)
       ast (~> 2.4.1)
     postrank-uri (1.1)
       addressable (>= 2.4.0)
@@ -141,8 +145,8 @@ GEM
       link_header (~> 0.0, >= 0.0.8)
     rdf-aggregate-repo (3.2.1)
       rdf (~> 3.2)
-    rdf-rdfa (3.2.0)
-      haml (~> 5.2)
+    rdf-rdfa (3.2.1)
+      haml (>= 5.2, < 7)
       htmlentities (~> 4.3)
       rdf (~> 3.2)
       rdf-aggregate-repo (~> 3.2)
@@ -156,7 +160,7 @@ GEM
     rdf-turtle (3.2.1)
       ebnf (~> 2.3)
       rdf (~> 3.2)
-    rdf-vocab (3.2.3)
+    rdf-vocab (3.2.4)
       rdf (~> 3.2, >= 3.2.4)
     rdf-xsd (3.2.1)
       rdf (~> 3.2)
@@ -172,24 +176,24 @@ GEM
     rspec-expectations (3.12.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.4)
+    rspec-mocks (3.12.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)
     rspec-xsd (0.1.0)
       nokogiri (~> 1.6)
       rspec (~> 3)
-    rubocop (1.48.1)
+    rubocop (1.49.0)
       json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.2.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.26.0, < 2.0)
+      rubocop-ast (>= 1.28.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.27.0)
+    rubocop-ast (1.28.0)
       parser (>= 3.2.1.0)
     rubocop-capybara (2.17.1)
       rubocop (~> 1.41)

data/commonmeta.gemspec

@@ -19,11 +19,13 @@ Gem::Specification.new do |s|
 
   # Declare dependencies here, rather than in the Gemfile
   s.add_dependency 'activesupport', '>= 4.2.5', '< 8.0'
+  s.add_dependency 'addressable', '~> 2.8.1', '< 2.8.2'
   s.add_dependency 'base32-url', '>= 0.5.0', '< 1'
   s.add_dependency 'bibtex-ruby', '~> 6.0'
   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'

data/lib/commonmeta/cli.rb

@@ -61,12 +61,24 @@ module Commonmeta
       puts encode_doi(prefix)
     end
 
+    desc '', 'encode_id'
+
+    def encode_id
+      puts encode_id
+    end
+
     desc '', 'decode'
 
     def decode(doi)
       puts decode_doi(doi)
     end
 
+    desc '', 'decode_id'
+
+    def decode_id(id)
+      puts decode_id(id)
+    end
+
     default_task :convert
   end
 end

data/lib/commonmeta/crossref_utils.rb

@@ -2,8 +2,9 @@
 
 module Commonmeta
   module CrossrefUtils
-    # To configure the writing of Crossref metadata, provide the following variables
-    # depositor, email, and registrant
+    # 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
     def write_crossref_xml
       @crossref_xml ||= Nokogiri::XML::Builder.new(encoding: 'UTF-8') do |xml|
         xml.doi_batch(crossref_root_attributes) do
@@ -12,10 +13,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(depositor)
-              xml.email_address(email)
+              xml.depositor_name(ENV.fetch('CROSSREF_DEPOSITOR_NAME', nil))
+              xml.email_address(ENV.fetch('CROSSREF_DEPOSITOR_EMAIL', nil))
             end
-            xml.registrant(registrant)
+            xml.registrant(ENV.fetch('CROSSREF_REGISTRANT', nil))
           end
           xml.body do
             insert_crossref_work(xml)