cirneco 0.6.8 → 0.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1f55d250fbc2819ba6dcb0e149578dfae54d66f
-  data.tar.gz: c2901c9c035c9e90733446082cbc792ad21a024f
+  metadata.gz: 340962d18c91ee11a3722511c861fc49e0bb6e4e
+  data.tar.gz: 91f07300e1859bbb79ca161c8305d133530c2cf1
 SHA512:
-  metadata.gz: e16557958449568427784eafa7c5c19ddc02330d44cacc7a65ccd887e8f4ac732a094c77210d5f638c9cd77b05879f3dfa2fcac0e423449a0131a5a23efa7cc9
-  data.tar.gz: 0ecc5a7b6c286de088191953894f41a11e6acd401925a8337c0bf32f4987d6c96dd6ece1f36f224544620038406108f1632beca6aca845db867731b30c6809c7
+  metadata.gz: 9a6c516820e7ceadd04e6cbc62667e21c978e02a9f0d2479658905062296fcd15156911086fee8b8adb985b5bb3369d2aa6f8a15236496192ec78c28b7e58991
+  data.tar.gz: 71e05301cc30f995cc2843edde2390aa909f1d23f443d067de7f49c498180cd17aba2f29a5b465753b6df474081eb859b6194007d336c1d0f5966391a2273f59

data/Gemfile.lock

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

data/lib/cirneco/utils.rb

@@ -38,6 +38,8 @@ module Cirneco
       metadata = generate_metadata_for_work(filepath, options)
       work = register_work_for_metadata(metadata)
 
+      return "Errors for DOI #{metadata["doi"]}:\n#{work.validation_errors}" if work.validation_errors.present?
+
       # datapath = options[:datapath] || ENV['DATAPATH'] || "data/doi.yml"
       # data = Bergamasco::Markdown.read_yaml(datapath) || []
       # data = [data] if data.is_a?(Hash)
@@ -60,6 +62,8 @@ module Cirneco
       metadata = generate_metadata_for_work(filepath, options)
       work = unregister_work_for_metadata(metadata)
 
+      return "Errors for DOI #{old_metadata["doi"]}:\n#{work.validation_errors}" if work.validation_errors.present?
+
       # datapath = options[:datapath] || ENV['DATAPATH'] || "data/doi.yml"
       # data = Bergamasco::Markdown.read_yaml(datapath) || []
       # data = [data] if data.is_a?(Hash)
@@ -195,8 +199,6 @@ module Cirneco
       filename  = metadata["doi"].split("/", 2).last + ".xml"
       IO.write(filename, work.data)
 
-      puts work.validation_errors if work.validation_errors.present?
-
       work
     end
 
@@ -206,8 +208,6 @@ module Cirneco
       filename  = metadata["doi"].split("/", 2).last + ".xml"
       File.delete(filename) if File.exist?(filename)
 
-      puts work.validation_errors if work.validation_errors.present?
-
       work
     end
   end

data/lib/cirneco/version.rb

@@ -1,3 +1,3 @@
 module Cirneco
-  VERSION = "0.6.8"
+  VERSION = "0.6.9"
 end

data/lib/cirneco/work.rb

@@ -38,7 +38,7 @@ module Cirneco
 
     def data
       Nokogiri::XML::Builder.new(:encoding => 'UTF-8') do |xml|
-        xml.send(:'resource', root_attributes) do
+        xml.resource(root_attributes) do
           insert_work(xml)
         end
       end.to_xml
@@ -64,10 +64,8 @@ module Cirneco
     end
 
     def insert_creators(xml)
-      return nil unless creators.present?
-
       xml.creators do
-        creators.each do |creator|
+        Array(creators).each do |creator|
           xml.creator do
             insert_person(xml, creator, "creator")
           end
@@ -76,7 +74,7 @@ module Cirneco
     end
 
     def insert_contributors(xml)
-      return nil unless contributors.present?
+      return xml unless contributors.present?
 
       xml.contributors do
         contributors.each do |contributor|
@@ -98,7 +96,7 @@ module Cirneco
     end
 
     def insert_titles(xml)
-      xml.send(:'titles') do
+      xml.titles do
         insert_title(xml)
       end
     end
@@ -115,6 +113,10 @@ module Cirneco
       xml.publicationYear(publication_year)
     end
 
+    def insert_resource_type(xml)
+      xml.resourceType(resource_type[:value], 'resourceTypeGeneral' => resource_type[:resource_type_general])
+    end
+
     def insert_subjects(xml)
       return xml unless subjects.present?
 
@@ -125,10 +127,6 @@ module Cirneco
       end
     end
 
-    def insert_resource_type(xml)
-      xml.resourceType(resource_type[:value], 'resourceTypeGeneral' => resource_type[:resource_type_general])
-    end
-
     def insert_version(xml)
       return xml unless version.present?
 

metadata

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