cirneco 0.9.7 → 0.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a076d3229005058b8f3eeacf32ecdd2048d3cf18
-  data.tar.gz: 7888a9e22e1a0afd420b0c318b9097db3b7c83e9
+  metadata.gz: be929143a58fd9c937df95525b11e3a3b76a722e
+  data.tar.gz: cccd893bcfeed2521ecd0b3937a0d945eca9f03b
 SHA512:
-  metadata.gz: ceb15a12b36cb89d7fe9fb5e94c664754bfaad8c04453451482c6f0c82d76fd7d0d797b84dcbdb8aea7e8d428491441485dc0f442adffcb3bd462c18145e8b4d
-  data.tar.gz: ff0f87808efa4785a5128b6a1973bb4fd85edd74be9616fc5c6ce3a9e9a9406df68014bcf16961f9eea0d781b1597d5977dc6cf308e727ec71145b8937292a75
+  metadata.gz: 2089c3c0c112b6830443d52da5257d109a259e4483a4df75e6e6dc12daf63f6b561cbf8374bf6e4c5a11daef9c22a974e48704c279b3112e2586403e0f082ddf
+  data.tar.gz: 6f2c1ffcb66d1937503e56e1e094df5514e05ccb0bfd95ed9aaa21a18aac303dfe8c283bc33e5fec028ee50e55e90aafb6874644a75bcad303c55b7122889bb3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cirneco (0.9.7)
+    cirneco (0.9.8)
       activesupport (~> 4.2, >= 4.2.5)
       base32-crockford-checksum (~> 0.2.2)
       bergamasco (~> 0.3)

data/lib/cirneco/utils.rb

@@ -245,6 +245,8 @@ module Cirneco
     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 }
+
       prefix = options[:prefix] || ENV['PREFIX']
       metadata["doi"] = encode_doi(prefix, number: metadata["alternate_identifier"]) if metadata["doi"].blank?
 
@@ -265,6 +267,8 @@ module Cirneco
     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 }
+
       prefix = options[:prefix] || ENV['PREFIX']
       metadata["doi"] = encode_doi(prefix, number: metadata["alternate_identifier"]) if metadata["doi"].blank?
 
@@ -288,6 +292,8 @@ module Cirneco
     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 }
+
       prefix = options[:prefix] || ENV['PREFIX']
       metadata["doi"] = encode_doi(prefix, number: metadata["alternate_identifier"]) if metadata["doi"].blank?
 
@@ -353,6 +359,8 @@ module Cirneco
     def generate_jats_for_url(url, options={})
       filename, build_path, source_path = filepath_from_url(url, options)
       metadata = generate_metadata_for_jats(build_path, options)
+      return "No JATS XML written for #{filename}" if metadata["published"].to_s == "false"
+
       file = IO.read(source_path)
       content = Bergamasco::Markdown.split_yaml_frontmatter(file).last
       text = Bergamasco::Markdown.join_yaml_frontmatter(metadata, content)

data/lib/cirneco/version.rb

@@ -1,3 +1,3 @@
 module Cirneco
-  VERSION = "0.9.7"
+  VERSION = "0.9.8"
 end

data/lib/cirneco/work.rb

@@ -119,6 +119,8 @@ module Cirneco
     end
 
     def insert_resource_type(xml)
+      return xml unless resource_type.present?
+
       xml.resourceType(resource_type[:value], 'resourceTypeGeneral' => resource_type[:resource_type_general])
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cirneco
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors:
 - Martin Fenner