toccatore 0.4.12 → 0.4.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78861df5575f3504d5cce258bc6bfd59751da8269a4b57f47f11d1bb4836930e
-  data.tar.gz: 57293cd4eae644a522a925046e61cd90b397621a32dc85d0dc050821bc4613e8
+  metadata.gz: c2e7bd1c2f2e2c09c0fe6adcab866b0dbb20b2b80904f961c19b47a2c1fb5d7c
+  data.tar.gz: ba2940625807aa1010be4a1e420338cfee27e303d9ed07647753931709d25829
 SHA512:
-  metadata.gz: d4860c8001b3e4a383cb537072e1e83ebfb9789894f16b2cbe2d7ceefcb52b617e35dd3abd103366a3b10039cb4a9b3701b5628a42cedb8520946d2cbbb965e7
-  data.tar.gz: 54a4c8fc3962e6d7c04889ad481bbc38344b5a5c9c38577142825cd4ae4bbf9a85c615639e6078dc79e1e9ed1a615718be5e4a0205ccfde479ffd5d8299aed9a
+  metadata.gz: 692694881c5c8d48542ce05abd38397b1dc656535851646e722e2bb42d3e95f512c3d62a3c6ab6894e55e9b8cfff93916c7fb8ab2aa42f6b308a8ab7cec2bdea
+  data.tar.gz: 16faa9f7e9015f81203b8c738ef584933778fc569e3d29d9d74cf455810cf249e1b9a54606c6b73a9ebfae38ef44899412c748318cef4e674821f60a34e55f0a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    toccatore (0.4.12)
+    toccatore (0.4.13)
       activesupport (>= 4.2.5, < 6)
       aws-sdk-sqs
       dotenv (~> 2.1, >= 2.1.1)

data/lib/toccatore/base.rb

@@ -82,7 +82,13 @@ module Toccatore
       puts text
 
       # send slack notification
-      options[:level] = total > 0 ? "good" : "warning"
+      if total == 0
+        options[:level] = "warning"
+      elsif error_total > 0
+        options[:level] = "danger"
+      else
+        options[:level] = "good"
+      end
       options[:title] = "Report for #{source_id}"
       send_notification_to_slack(text, options) if options[:slack_webhook_url].present?
 

data/lib/toccatore/datacite_related.rb

@@ -58,7 +58,10 @@ module Toccatore
     end
 
     def push_item(item, options={})
-      return OpenStruct.new(body: { "errors" => [{ "title" => "Access token missing." }] }) if options[:access_token].blank?
+      if options[:access_token].blank?
+        puts "Access token missing."
+        return 1
+      end
 
       host = options[:push_url].presence || "https://bus.eventdata.crossref.org"
       push_url = host + "/events"
@@ -92,6 +95,9 @@ module Toccatore
       if response.status == 201
         puts "#{item['subj_id']} #{item['relation_type_id']} #{item['obj_id']} pushed to Event Data service."
         0
+      elsif response.status == 409
+        puts "#{item['subj_id']} #{item['relation_type_id']} #{item['obj_id']} already pushed to Event Data service."
+        0
       elsif response.body["errors"].present?
         puts "#{item['subj_id']} #{item['relation_type_id']} #{item['obj_id']} had an error:"
         puts "#{response.body['errors'].first['title']}"

data/lib/toccatore/orcid_update.rb

@@ -44,9 +44,13 @@ module Toccatore
     end
 
     def push_item(item, options={})
-      return OpenStruct.new(body: { "errors" => [{ "title" => "Access token missing." }] }) if options[:access_token].blank?
+      if options[:access_token].blank?
+        puts "Access token missing."
+        return 1
+      end
 
-      push_url = (options[:push_url].presence || "https://profiles.datacite.org/api") + "/claims"
+      host = options[:push_url].presence || "https://profiles.datacite.org/api"
+      push_url = host + "/claims"
 
       response = Maremma.post(push_url, data: { "claim" => item }.to_json,
                                         bearer: options[:access_token],

data/lib/toccatore/usage_update.rb

@@ -161,10 +161,11 @@ module Toccatore
                   "id" => item["uuid"],
                   "type" => "events",
                   "attributes" => item.except("id") }}
+                  
       response = Maremma.put(push_url, data: data.to_json,
-                                        bearer: options[:access_token],
-                                        content_type: 'application/json',
-                                        host: host)
+                                       bearer: options[:access_token],
+                                       content_type: 'json',
+                                       host: host)
                                   
       if response.status == 201 
         puts "#{item['subj-id']} #{item['relation-type-id']} #{item['obj-id']} pushed to Event Data service."

data/lib/toccatore/version.rb

@@ -1,3 +1,3 @@
 module Toccatore
-  VERSION = "0.4.12"
+  VERSION = "0.4.13"
 end

data/spec/cli_spec.rb

@@ -8,7 +8,7 @@ describe Toccatore::CLI do
 
   describe "version" do
     it 'has version' do
-      expect { subject.__print_version }.to output("0.4.12\n").to_stdout
+      expect { subject.__print_version }.to output("0.4.13\n").to_stdout
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: toccatore
 version: !ruby/object:Gem::Version
-  version: 0.4.12
+  version: 0.4.13
 platform: ruby
 authors:
 - Martin Fenner