fix crossref_json file parsing

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    briard (2.8.1)
+    briard (2.8.2)
       activesupport (>= 4.2.5, < 8.0)
       base32-url (>= 0.5.0, < 1)
       benchmark_methods (~> 0.7)

lib/briard/readers/crossref_json_reader.rb

@@ -7,8 +7,10 @@ def get_crossref_json(id: nil, **options)
           return { 'string' => nil, 'state' => 'not_found' } unless id.present?
 
           url = crossref_api_url(id, options)
-          response = Maremma.get(url, raw: true)
-          string = response.body.fetch('data', nil)
+          response = Maremma.get(url)
+          return { 'string' => nil, 'state' => 'not_found' } if response.body.dig('data', 'status') != 'ok'
+
+          string = response.body.dig('data', 'message').to_json
 
           { 'string' => string }
         end
@@ -21,9 +23,8 @@ def read_crossref_json(string: nil, **options)
 
           read_options = ActiveSupport::HashWithIndifferentAccess.new(options.except(:doi, :id, :url,
                                                                                      :sandbox, :validate, :ra))
-
-          meta = string.present? ? Maremma.from_json(string).fetch('message', {}) : {}
-
+          meta = string.present? ? Maremma.from_json(string) : {}
+
           resource_type = meta.fetch('type', nil)
           resource_type = resource_type.present? ? resource_type.underscore.camelcase : nil
 

lib/briard/utils.rb

@@ -488,10 +488,6 @@ module Utils
     }
 
     def find_from_format(id: nil, string: nil, ext: nil, filename: nil)
-      puts id
-      puts string
-      puts ext
-      puts filename
       if id.present?
         find_from_format_by_id(id)
       elsif string.present? && ext.present?

lib/briard/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Briard
-  VERSION = '2.8.1'
+  VERSION = '2.8.2'
 end

spec/cli_spec.rb

@@ -9,6 +9,39 @@
   end
 
   describe "convert from id", vcr: true do
+    context "crossref_json" do
+      let(:input) { "10.7554/eLife.01567" }
+
+      it 'default' do
+        expect { subject.convert input }.to output(/additionalType/).to_stdout
+      end
+
+      it 'to schema_org' do
+        subject.options = { from: "crossref_json", to: "schema_org" }
+        expect { subject.convert input }.to output(/additionalType/).to_stdout
+      end
+
+      it 'to crossref' do
+        subject.options = { from: "crossref_json", to: "crossref" }
+        expect { subject.convert input }.to output(/journal_metadata/).to_stdout
+      end
+
+      it 'to datacite' do
+        subject.options = { from: "crossref_json", to: "datacite" }
+        expect { subject.convert input }.to output(/http:\/\/datacite.org\/schema\/kernel-4/).to_stdout
+      end
+
+      it 'to bibtex' do
+        subject.options = { from: "crossref_json", to: "bibtex" }
+        expect { subject.convert input }.to output(/@article{https:\/\/doi.org\/10.7554\/elife.01567/).to_stdout
+      end
+
+      it 'to citation' do
+        subject.options = { from: "crossref_json", to: "citation", style: "vancouver" }
+        expect { subject.convert input }.to output(/Sankar M, Nieminen K, Ragni L, Xenarios I/).to_stdout
+      end
+    end
+
     context "crossref" do
       let(:input) { "10.7554/eLife.01567" }
 
@@ -133,7 +166,7 @@
       let(:file) { fixture_path + "crossref.xml" }
 
       it 'default' do
-        expect { subject.convert file }.to output(/datePublished/).to_stdout
+        expect { subject.convert file }.to output(/"@id": "https:\/\/doi.org\/10.7554\/elife.01567"/).to_stdout
       end
 
       it 'to schema_org' do
@@ -148,7 +181,35 @@
 
       it 'to datacite' do
         subject.options = { to: "datacite" }
-        expect { subject.convert file }.to output(/http:\/\/datacite.org\/schema\/kernel-4/).to_stdout
+        expect { subject.convert file }.to output(/<publisher>/).to_stdout
+      end
+
+      it 'to bibtex' do
+        subject.options = { to: "bibtex" }
+        expect { subject.convert file }.to output(/@article{https:\/\/doi.org\/10.7554\/elife.01567/).to_stdout
+      end
+    end
+
+    context "crossref_json", vcr: true do
+      let(:file) { fixture_path + "crossref.json" }
+
+      it 'default' do
+        expect { subject.convert file }.to output(/"@id": "https:\/\/doi.org\/10.7554\/elife.01567"/).to_stdout
+      end
+
+      it 'to schema_org' do
+        subject.options = { to: "schema_org" }
+        expect { subject.convert file }.to output(/"@context": "http:\/\/schema.org"/).to_stdout
+      end
+
+      it 'to crossref' do
+        subject.options = { to: "crossref" }
+        expect { subject.convert file }.to output(/journal_metadata/).to_stdout
+      end
+
+      it 'to datacite' do
+        subject.options = { to: "datacite" }
+        expect { subject.convert file }.to output(/<publisher>/).to_stdout
       end
 
       it 'to bibtex' do
@@ -171,7 +232,7 @@
 
       it 'to datacite' do
         subject.options = { to: "datacite" }
-        expect { subject.convert file }.to output(/http:\/\/datacite.org\/schema\/kernel-4/).to_stdout
+        expect { subject.convert file }.to output(/<publisher>/).to_stdout
       end
 
       it 'to bibtex' do