cirneco 0.9.12 → 0.9.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d4bcf5675ef3673522be79fd7106614513ecfdf
-  data.tar.gz: 53747a0efc2257fb563711017f47d56ceae19348
+  metadata.gz: 26264768a88f4fa5359062dc47a64fd378baee79
+  data.tar.gz: f6a57d8575940385bd04000497800080be5f6216
 SHA512:
-  metadata.gz: 914c0308b088a03ad2cb26c7106f84a3ece09a13b4fa339f135026ee7849f2026615fc736478c5d5b08e334347de25a6860a12838c2a5ec73d67af80cf4c9cd4
-  data.tar.gz: 9e3d04ee0564f380eb3a285985ef5a2dda22af275f094c48f3dfe762610a49d1baa0ec19ef5f2937e0a9c345dc0350ac3b0da99b6b830d19704cd34889b6e3bd
+  metadata.gz: 7ec100120cb41af67f14bdf17c70a82e819b24ccf7897f35238336c348ae6fab1773ecb582b42375a9daecc0905d25f758677bd06c672d320c8010e3c5813ada
+  data.tar.gz: 120c30769c64f9f173e3d1a9d2239c17c2e288cd17f83986c85d501fa288d3c35945101b76f4d1f874d7d8ace745acc54c6f09dca76ce8ef48e0bd4bcbbf59d4

data/Gemfile.lock

@@ -1,46 +1,71 @@
 PATH
   remote: .
   specs:
-    cirneco (0.9.12)
-      activesupport (~> 4.2, >= 4.2.5)
+    cirneco (0.9.13)
+      activesupport (>= 4.2.5, < 6)
       base32-crockford-checksum (~> 0.2.2)
       bergamasco (~> 0.3)
+      bolognese (~> 0.9.32)
       builder (~> 3.2, >= 3.2.2)
       dotenv (~> 2.1, >= 2.1.1)
-      maremma (~> 3.1.2)
+      maremma (~> 3.5, >= 3.5.7)
       nokogiri (~> 1.6, >= 1.6.8)
       thor (~> 0.19)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.7.1)
+    activesupport (5.1.2)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.5.0)
+    addressable (2.5.1)
       public_suffix (~> 2.0, >= 2.0.2)
     base32-crockford-checksum (0.2.3)
-    bergamasco (0.3.12)
-      activesupport (~> 4.2, >= 4.2.5)
+    benchmark_methods (0.7)
+    bergamasco (0.3.15)
+      activesupport (>= 4.2.5, < 6)
       addressable (>= 2.3.6)
       builder (~> 3.2, >= 3.2.2)
       loofah (~> 2.0, >= 2.0.3)
-      multi_json (~> 1.11.2)
-      nokogiri (~> 1.6.7)
-      oj (~> 2.13.1)
+      multi_json (~> 1.12)
+      nokogiri (~> 1.6, >= 1.6.8)
+      oj (~> 2.18, >= 2.18.1)
       pandoc-ruby (~> 2.0, >= 2.0.0)
       safe_yaml (~> 1.0, >= 1.0.4)
+    bibtex-ruby (4.4.4)
+      latex-decode (~> 0.0)
+    bolognese (0.9.32)
+      activesupport (>= 4.2.5, < 6)
+      benchmark_methods (~> 0.7)
+      bibtex-ruby (~> 4.1)
+      builder (~> 3.2, >= 3.2.2)
+      colorize (~> 0.8.1)
+      gender_detector (~> 0.1.2)
+      json-ld (~> 2.1, >= 2.1.2)
+      jsonlint (~> 0.2.0)
+      loofah (~> 2.0, >= 2.0.3)
+      maremma (~> 3.5, >= 3.5.7)
+      namae (~> 0.11.3)
+      nokogiri (~> 1.6, >= 1.6.8)
+      postrank-uri (~> 1.0, >= 1.0.18)
+      rdf-rdfxml (~> 2.0)
+      rdf-turtle (~> 2.2)
+      thor (~> 0.19)
     builder (3.2.3)
-    codeclimate-test-reporter (1.0.5)
+    codeclimate-test-reporter (1.0.7)
       simplecov
+    colorize (0.8.1)
+    concurrent-ruby (1.0.5)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     diff-lcs (1.3)
     docile (1.1.5)
-    dotenv (2.2.0)
+    dotenv (2.2.1)
+    ebnf (1.1.1)
+      rdf (~> 2.2)
+      sxp (~> 1.0)
     excon (0.45.4)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
@@ -48,63 +73,113 @@ GEM
       faraday
     faraday_middleware (0.10.1)
       faraday (>= 0.7.4, < 1.0)
-    hashdiff (0.3.2)
-    i18n (0.8.0)
-    json (1.8.6)
+    gender_detector (0.1.2)
+      unicode_utils (>= 1.3.0)
+    haml (5.0.1)
+      temple (>= 0.8.0)
+      tilt
+    hamster (3.0.0)
+      concurrent-ruby (~> 1.0)
+    hashdiff (0.3.4)
+    htmlentities (4.3.4)
+    i18n (0.8.6)
+    json (2.1.0)
+    json-ld (2.1.5)
+      multi_json (~> 1.12)
+      rdf (~> 2.2)
+    jsonlint (0.2.0)
+      oj (~> 2)
+      trollop (~> 2)
+    latex-decode (0.2.2)
+      unicode (~> 0.4)
+    link_header (0.0.8)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
-    maremma (3.1.2)
-      activesupport (~> 4.2, >= 4.2.5)
-      addressable (~> 2.5)
+    maremma (3.5.8)
+      activesupport (>= 4.2.5)
+      addressable (>= 2.3.6)
       builder (~> 3.2, >= 3.2.2)
       excon (~> 0.45.0)
       faraday (~> 0.9.2)
       faraday-encoding (~> 0.0.1)
       faraday_middleware (~> 0.10.0)
-      multi_json (~> 1.11.2)
-      nokogiri (~> 1.6.7)
-      oj (~> 2.13.1)
+      multi_json (~> 1.12)
+      nokogiri (~> 1.6, >= 1.6.8)
+      oj (~> 2.18, >= 2.18.1)
     mini_portile2 (2.1.0)
-    minitest (5.10.1)
-    multi_json (1.11.3)
+    minitest (5.10.3)
+    multi_json (1.12.1)
     multipart-post (2.0.0)
-    nokogiri (1.6.8.1)
+    namae (0.11.3)
+    nokogiri (1.7.2)
       mini_portile2 (~> 2.1.0)
-    oj (2.13.1)
+    oj (2.18.5)
     pandoc-ruby (2.0.1)
+    postrank-uri (1.0.22)
+      addressable (>= 2.3.0, < 2.6)
+      nokogiri (>= 1.6.1, < 1.8)
+      public_suffix (>= 2.0.0, < 2.1)
     public_suffix (2.0.5)
-    rack (2.0.1)
-    rack-test (0.6.3)
-      rack (>= 1.0)
+    rack (2.0.3)
+    rack-test (0.7.0)
+      rack (>= 1.0, < 3)
     rake (12.0.0)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
+    rdf (2.2.6)
+      hamster (~> 3.0)
+      link_header (~> 0.0, >= 0.0.8)
+    rdf-aggregate-repo (2.2.0)
+      rdf (~> 2.0)
+    rdf-rdfa (2.2.2)
+      haml (~> 5.0)
+      htmlentities (~> 4.3)
+      rdf (~> 2.2)
+      rdf-aggregate-repo (~> 2.2)
+      rdf-xsd (~> 2.1)
+    rdf-rdfxml (2.0.0)
+      htmlentities (~> 4.3)
+      rdf (~> 2.0)
+      rdf-rdfa (~> 2.0)
+      rdf-xsd (~> 2.0)
+    rdf-turtle (2.2.0)
+      ebnf (~> 1.1)
+      rdf (~> 2.2)
+    rdf-xsd (2.2.0)
+      rdf (~> 2.1)
+    rspec (3.6.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
+      rspec-support (~> 3.6.0)
+    rspec-mocks (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
     rspec-xsd (0.1.0)
       nokogiri (~> 1.6)
       rspec (~> 3)
     safe_yaml (1.0.4)
-    simplecov (0.12.0)
+    simplecov (0.14.1)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
+    simplecov-html (0.10.1)
+    sxp (1.0.0)
+      rdf (~> 2.0)
+    temple (0.8.0)
     thor (0.19.4)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
+    thread_safe (0.3.6)
+    tilt (2.0.7)
+    trollop (2.1.2)
+    tzinfo (1.2.3)
       thread_safe (~> 0.1)
+    unicode (0.4.4.4)
+    unicode_utils (1.4.0)
     vcr (3.0.3)
-    webmock (1.24.6)
+    webmock (3.0.1)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
@@ -120,9 +195,9 @@ DEPENDENCIES
   rake (~> 12.0)
   rspec (~> 3.4)
   rspec-xsd (~> 0.1.0)
-  simplecov (~> 0.12.0)
+  simplecov (~> 0.14.1)
   vcr (~> 3.0, >= 3.0.3)
-  webmock (~> 1.22, >= 1.22.3)
+  webmock (~> 3.0, >= 3.0.1)
 
 BUNDLED WITH
-   1.12.5
+   1.15.3

data/cirneco.gemspec

@@ -15,12 +15,13 @@ Gem::Specification.new do |s|
   s.license       = 'MIT'
 
   # Declary dependencies here, rather than in the Gemfile
-  s.add_dependency 'maremma', '~> 3.1.2'
+  s.add_dependency 'maremma', '~> 3.5', '>= 3.5.7'
   s.add_dependency 'bergamasco', '~> 0.3'
+  s.add_dependency 'bolognese', '~> 0.9.32'
   s.add_dependency 'base32-crockford-checksum', '~> 0.2.2'
   s.add_dependency 'nokogiri', '~> 1.6', '>= 1.6.8'
   s.add_dependency 'builder', '~> 3.2', '>= 3.2.2'
-  s.add_dependency 'activesupport', '~> 4.2', '>= 4.2.5'
+  s.add_dependency 'activesupport', '>= 4.2.5', '< 6'
   s.add_dependency 'dotenv', '~> 2.1', '>= 2.1.1'
   s.add_dependency 'thor', '~> 0.19'
   s.add_development_dependency 'bundler', '~> 1.0'
@@ -29,9 +30,9 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rake', '~> 12.0'
   s.add_development_dependency 'rack-test', '~> 0'
   s.add_development_dependency 'vcr', '~> 3.0', '>= 3.0.3'
-  s.add_development_dependency 'webmock', '~> 1.22', '>= 1.22.3'
+  s.add_development_dependency 'webmock', '~> 3.0', '>= 3.0.1'
   s.add_development_dependency 'codeclimate-test-reporter', '~> 1.0', '>= 1.0.0'
-  s.add_development_dependency 'simplecov', '~> 0.12.0'
+  s.add_development_dependency 'simplecov', '~> 0.14.1'
 
   s.require_paths = ["lib"]
   s.files       = `git ls-files`.split($/)

data/lib/cirneco/api.rb

@@ -6,7 +6,7 @@ module Cirneco
     def post_metadata(data, options={})
       return OpenStruct.new(body: { "errors" => [{ "title" => "Username or password missing" }] }) unless options[:username].present? && options[:password].present?
 
-      mds_url = options[:sandbox] ? 'https://mds-sandbox.datacite.org' : 'https://mds.datacite.org'
+      mds_url = options[:sandbox] ? 'https://mds.test.datacite.org' : 'https://mds.datacite.org'
 
       url = "#{mds_url}/metadata"
       Maremma.post(url, content_type: 'application/xml;charset=UTF-8', data: data, username: options[:username], password: options[:password])
@@ -15,7 +15,7 @@ module Cirneco
     def get_metadata(doi, options={})
       return OpenStruct.new(body: { "errors" => [{ "title" => "Username or password missing" }] }) unless options[:username].present? && options[:password].present?
 
-      mds_url = options[:sandbox] ? 'https://mds-sandbox.datacite.org' : 'https://mds.datacite.org'
+      mds_url = options[:sandbox] ? 'https://mds.test.datacite.org' : 'https://mds.datacite.org'
 
       url = "#{mds_url}/metadata/#{doi}"
       Maremma.get(url, accept: 'application/xml', username: options[:username], password: options[:password], raw: true)
@@ -24,7 +24,7 @@ module Cirneco
     def delete_metadata(doi, options={})
       return OpenStruct.new(body: { "errors" => [{ "title" => "Username or password missing" }] }) unless options[:username].present? && options[:password].present?
 
-      mds_url = options[:sandbox] ? 'https://mds-sandbox.datacite.org' : 'https://mds.datacite.org'
+      mds_url = options[:sandbox] ? 'https://mds.test.datacite.org' : 'https://mds.datacite.org'
 
       url = "#{mds_url}/metadata/#{doi}"
       Maremma.delete(url, username: options[:username], password: options[:password])
@@ -35,7 +35,7 @@ module Cirneco
 
       payload = "doi=#{doi}\nurl=#{options[:url]}"
 
-      mds_url = options[:sandbox] ? 'https://mds-sandbox.datacite.org' : 'https://mds.datacite.org'
+      mds_url = options[:sandbox] ? 'https://mds.test.datacite.org' : 'https://mds.datacite.org'
 
       url = "#{mds_url}/doi/#{doi}"
       Maremma.put(url, content_type: 'text/plain;charset=UTF-8', data: payload, username: options[:username], password: options[:password])
@@ -44,7 +44,7 @@ module Cirneco
     def get_doi(doi, options={})
       return OpenStruct.new(body: { "errors" => [{ "title" => "Username or password missing" }] }) unless options[:username].present? && options[:password].present?
 
-      mds_url = options[:sandbox] ? 'https://mds-sandbox.datacite.org' : 'https://mds.datacite.org'
+      mds_url = options[:sandbox] ? 'https://mds.test.datacite.org' : 'https://mds.datacite.org'
 
       url = "#{mds_url}/doi/#{doi}"
       Maremma.get(url, username: options[:username], password: options[:password])
@@ -53,7 +53,7 @@ module Cirneco
     def get_dois(options={})
       return OpenStruct.new(body: { "errors" => [{ "title" => "Username or password missing" }] }) unless options[:username].present? && options[:password].present?
 
-      mds_url = options[:sandbox] ? 'https://mds-sandbox.datacite.org' : 'https://mds.datacite.org'
+      mds_url = options[:sandbox] ? 'https://mds.test.datacite.org' : 'https://mds.datacite.org'
 
       url = "#{mds_url}/doi"
       response = Maremma.get(url, username: options[:username], password: options[:password])
@@ -66,7 +66,7 @@ module Cirneco
 
       payload = options[:raw] ? options[:media] : options[:media].map { |m| "#{m[:mime_type]}=#{m[:url]}" }.join("\n")
 
-      mds_url = options[:sandbox] ? 'https://mds-sandbox.datacite.org' : 'https://mds.datacite.org'
+      mds_url = options[:sandbox] ? 'https://mds.test.datacite.org' : 'https://mds.datacite.org'
 
       url = "#{mds_url}/media/#{doi}"
       Maremma.post(url, content_type: 'text/plain;charset=UTF-8', data: payload, username: options[:username], password: options[:password])
@@ -75,7 +75,7 @@ module Cirneco
     def get_media(doi, options={})
       return OpenStruct.new(body: { "errors" => [{ "title" => "Username or password missing" }] }) unless options[:username].present? && options[:password].present?
 
-      mds_url = options[:sandbox] ? 'https://mds-sandbox.datacite.org' : 'https://mds.datacite.org'
+      mds_url = options[:sandbox] ? 'https://mds.test.datacite.org' : 'https://mds.datacite.org'
 
       url = "#{mds_url}/media/#{doi}"
       response = Maremma.get(url, accept: 'application/xml', username: options[:username], password: options[:password])

data/lib/cirneco/base.rb

@@ -4,7 +4,7 @@ module Cirneco
     env_file = File.expand_path("../../../.env", __FILE__)
     if File.exist?(env_file)
       require 'dotenv'
-      Dotenv.load! env_file
+      Dotenv.overload env_file
     end
 
     # load ENV variables from container environment if json file exists
@@ -16,6 +16,6 @@ module Cirneco
     end
 
     # default values for some ENV variables
-    ENV['MDS_URL'] ||= "https://mds-sandbox.datacite.org"
+    ENV['MDS_URL'] ||= "https://mds.test.datacite.org"
   end
 end

data/lib/cirneco/cli.rb

@@ -16,7 +16,7 @@ module Cirneco
     env_file = File.expand_path("../../.env", __FILE__)
     if File.exist?(env_file)
       require 'dotenv'
-      Dotenv.load! env_file
+      Dotenv.overload env_file
     end
 
     def self.exit_on_failure?

data/lib/cirneco/utils.rb

@@ -107,13 +107,14 @@ module Cirneco
     def mint_doi_for_url(url, options={})
       filename, build_path, source_path = filepath_from_url(url, options)
 
-      metadata = generate_metadata_for_work(build_path, options)
-      return "DOI #{metadata["doi"]} not changed for #{filename}" if metadata["doi"] && metadata["date_updated"] == metadata["date_issued"] && options[:force].blank?
+      json = get_json_ld_from_work(build_path, options)
+      metadata = JSON.parse(json)
+      return "DOI #{metadata["doi"]} not changed for #{filename}" if metadata["doi"] && metadata["dateModified"] == metadata["datePublished"] && options[:force].blank?
 
-      response = post_metadata_for_work(metadata, options)
-      return "Errors for DOI #{metadata["doi"]}: #{response.body['errors'].first['title']}\n" if response.body['errors'].present?
+      prefix = options[:prefix] || ENV['PREFIX']
+      doi = encode_doi(prefix, number: metadata["alternateName"]) if metadata["doi"].blank?
 
-      new_metadata = Bergamasco::Markdown.update_file(source_path, "doi" => metadata["doi"], "date" => metadata["date_updated"])
+      new_metadata = Bergamasco::Markdown.update_file(source_path, "doi" => doi, "date" => metadata["dateModified"])
       "DOI #{new_metadata["doi"]} minted for #{filename}"
     end
 
@@ -121,14 +122,22 @@ module Cirneco
     def mint_and_hide_doi_for_url(url, options={})
       filename, build_path, source_path = filepath_from_url(url, options)
 
-      metadata = generate_metadata_for_work(build_path, options)
-      return "DOI #{metadata["doi"]} not changed for #{filename}" if metadata["doi"] && metadata["date_updated"] == metadata["date_issued"] && options[:force].blank?
+      json = get_json_ld_from_work(build_path, options)
+      metadata = JSON.parse(json)
+      metadata["doi"] = doi_from_url(metadata["@id"])
+      return "DOI #{metadata["doi"]} not changed for #{filename}" if metadata["doi"] && metadata["dateModified"] == metadata["datePublished"] && options[:force].blank?
+
+      prefix = options[:prefix] || ENV['PREFIX']
+      metadata["doi"] = encode_doi(prefix, number: metadata["alternateName"]) if metadata["doi"].blank?
+
+      response = post_metadata_for_work(json, options.merge(doi: metadata["doi"]))
+      return "Errors for DOI #{metadata["doi"]}: #{response.body['errors'].first['title']}\n" if response.body['errors'].present?
 
-      response = post_metadata_for_work(metadata, options)
+      response = hide_metadata_for_work(json, options.merge(doi: metadata["doi"]))
       return "Errors for DOI #{metadata["doi"]}: #{response.body['errors'].first['title']}\n" if response.body['errors'].present?
 
-      new_metadata = Bergamasco::Markdown.update_file(source_path, "doi" => metadata["doi"], "date" => metadata["date_updated"])
-      "DOI #{new_metadata["doi"]} minted and hidden for #{filename}"
+      new_metadata = Bergamasco::Markdown.update_file(source_path, "published" => false)
+      "DOI #{metadata["doi"]} minted and hidden for #{filename}"
     end
 
     # fetch schema.org metadata in JSON-LD format to mint DOI
@@ -136,11 +145,13 @@ module Cirneco
     def hide_doi_for_url(url, options={})
       filename, build_path, source_path = filepath_from_url(url, options)
 
-      metadata = generate_metadata_for_work(build_path, options)
+      json = get_json_ld_from_work(build_path, options)
+      metadata = JSON.parse(json)
+      metadata["doi"] = doi_from_url(metadata["@id"])
       return "No DOI for #{filename}" unless metadata["doi"]
-      return "DOI #{metadata["doi"]} not active for #{filename}" unless metadata["date_issued"] || options[:force].present?
+      return "DOI #{metadata["doi"]} not active for #{filename}" unless metadata["datePublished"] || options[:force].present?
 
-      response = hide_metadata_for_work(metadata, options)
+      response = hide_metadata_for_work(json, options)
       return "Errors for DOI #{metadata["doi"]}: #{response.body['errors'].first['title']}\n" if response.body['errors'].present?
 
       new_metadata = Bergamasco::Markdown.update_file(source_path, "published" => false)
@@ -177,111 +188,52 @@ module Cirneco
       metadata.fetch("hasPart", []).map { |p| p["@id"] } + [url]
     end
 
-    def generate_metadata_for_work(url, options={})
+    def get_json_ld_from_work(url, options={})
       doc = Nokogiri::HTML(open(url))
       json = doc.at_xpath("//script[@type='application/ld+json']")
       return { "error" => "Error: no schema.org metadata found" } unless json.present?
 
-      metadata = ActiveSupport::JSON.decode(json.text)
-      return { "error" => "Error: blog post not published" } if metadata["published"].to_s == "false"
-      return { "error" => "Error: required metadata missing" } unless ["name", "author", "publisher", "datePublished", "@type"].all? { |k| metadata.key? k }
-
-      # required metadata
-      if /(http|https):\/\/(dx\.)?doi\.org\/(\w+)/.match(metadata["@id"])
-        uri = Addressable::URI.parse(metadata["@id"])
-        metadata["doi"] = uri.path[1..-1].upcase
-      end
-
-      metadata["title"] = metadata["name"]
-
-      metadata["creators"] = format_authors(metadata["author"])
-
-      metadata["publisher"] = metadata.fetch("publisher", {}).fetch("name", nil)
-      metadata["publication_year"] = metadata["datePublished"][0..3].to_i
-
-      resource_type_general = case metadata["@type"]
-        when "Dataset" then "Dataset"
-        when "Blog" then "Collection"
-        when "Code" then "Software"
-        else "Text"
-        end
-
-      metadata["resource_type"] = { value: metadata["@type"],
-                                    resource_type_general: resource_type_general }
-
-      # recommended metadata
-
-      # use alternate_identifier to generate DOI
-      metadata["alternate_identifier"] = metadata["alternateName"]
-
-      if metadata["description"].present?
-        metadata["descriptions"] = [{ value: metadata["description"], description_type: "Abstract" }]
-      end
-
-      # use default version 1.0
-      metadata["version"] ||= "1.0"
-
-      # fetch reference metadata if available
-      metadata["related_identifiers"] = get_related_identifiers(metadata)
-
-      if metadata["license"].present?
-        value = LICENSES.fetch(metadata["license_url"], nil)
-        metadata["rights_list"] = [{ value: value, rights_uri: metadata["license"] }] if value.present?
-      end
-
-      if metadata["keywords"].present?
-        metadata["subjects"] = Array(metadata["keywords"].split(", ")).select { |k| k != "featured" }
-      end
-
-      metadata["media"] = format_media(metadata)
-
-      metadata["date_created"] = metadata["dateCreated"]
-      metadata["date_issued"] = metadata["datePublished"]
-      metadata["date_updated"] = metadata["dateModified"]
-
-      metadata = metadata.extract!(*%w(doi alternate_identifier url creators title
-        publisher publication_year resource_type descriptions version rights_list
-        subjects date_issued date_created date_updated related_identifiers media))
+      json.text
     end
 
-    def post_metadata_for_work(metadata, options={})
-      return OpenStruct.new(body: { "errors" => [{"title" => "Error: required metadata missing" }] }) unless ["title", "creators", "publisher", "publication_year", "resource_type"].all? { |k| metadata.key? k }
+    def post_metadata_for_work(input, options={})
+      metadata = JSON.parse(input)
 
       prefix = options[:prefix] || ENV['PREFIX']
-      metadata["doi"] = encode_doi(prefix, number: metadata["alternate_identifier"]) if metadata["doi"].blank?
+      doi = encode_doi(prefix, number: metadata["alternateName"]) if metadata["doi"].blank?
 
-      work = Cirneco::Work.new(metadata)
-      return work.validation_errors if work.validation_errors.body["errors"].present?
+      work = Cirneco::Work.new(input: input, doi: doi)
+      return work.errors if work.errors.present?
 
-      response = work.post_metadata(work.data, options)
+      response = work.post_metadata(work.datacite, options)
       return response unless response.status == 201
 
-      response = work.put_doi(metadata["doi"], options.merge(url: metadata["url"]))
+      response = work.put_doi(work.doi, options.merge(url: metadata["url"]))
       return response unless response.status == 201
 
       if work.media.present?
-        work.post_media(metadata["doi"], options.merge(media: work.media))
+        work.post_media(metadata.doi, options.merge(media: work.media))
       else
         response
       end
     end
 
-    def post_and_hide_metadata_for_work(metadata, options={})
-      return OpenStruct.new(body: { "errors" => [{"title" => "Error: required metadata missing" }] }) unless ["title", "creators", "publisher", "publication_year", "resource_type"].all? { |k| metadata.key? k }
+    def post_and_hide_metadata_for_work(input, options={})
+      metadata = JSON.parse(input)
 
       prefix = options[:prefix] || ENV['PREFIX']
-      metadata["doi"] = encode_doi(prefix, number: metadata["alternate_identifier"]) if metadata["doi"].blank?
+      doi = encode_doi(prefix, number: metadata["alternateName"]) if metadata["doi"].blank?
 
-      work = Cirneco::Work.new(metadata)
-      return work.validation_errors if work.validation_errors.body["errors"].present?
+      work = Cirneco::Work.new(input: input, doi: doi)
+      return work.errors if work.errors.present?
 
-      response = work.post_metadata(work.data, options)
+      response = work.post_metadata(work.datacite, options)
       return response unless response.status == 201
 
-      response = work.put_doi(metadata["doi"], options.merge(url: metadata["url"]))
+      response = work.put_doi(work.doi, options.merge(url: metadata["url"]))
       return response unless response.status == 201
 
-      response = work.delete_metadata(metadata["doi"], options)
+      response = work.delete_metadata(doi, options)
       return response unless response.status == 201
 
       if work.media.present?
@@ -291,14 +243,15 @@ module Cirneco
       end
     end
 
-    def hide_metadata_for_work(metadata, options={})
-      return OpenStruct.new(body: { "errors" => [{"title" => "Error: required metadata missing" }] }) unless ["title", "creators", "publisher", "publication_year", "resource_type"].all? { |k| metadata.key? k }
+    def hide_metadata_for_work(input, options={})
+      metadata = JSON.parse(input)
+      metadata["doi"] = doi_from_url(metadata["@id"])
 
       prefix = options[:prefix] || ENV['PREFIX']
-      metadata["doi"] = encode_doi(prefix, number: metadata["alternate_identifier"]) if metadata["doi"].blank?
+      metadata["doi"] = encode_doi(prefix, number: metadata["alternateName"]) if metadata["doi"].blank?
 
-      work = Cirneco::Work.new(metadata)
-      return work.validation_errors if work.validation_errors.body["errors"].present?
+      work = Cirneco::Work.new(input: input, doi: metadata["doi"])
+      return work.errors if work.errors.present?
 
       work.delete_metadata(metadata["doi"], options)
     end

data/lib/cirneco/version.rb

@@ -1,3 +1,3 @@
 module Cirneco
-  VERSION = "0.9.12"
+  VERSION = "0.9.13"
 end