toccatore 0.3.6 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8698a6f69a4f27c74355a45e88cd1f6d0725d48e
-  data.tar.gz: 00da3c549c74c394783defee1ec0c6213ec13195
+  metadata.gz: 8c2d076ad83a73165bf2089a008c4461e477081d
+  data.tar.gz: e919fb11f3c1175f829a0df922b7e61316e89584
 SHA512:
-  metadata.gz: f345ab88662824dfd50bc174b10895f2bd3aaa87dc925b086c92a8492d69c3a7b946fcc7d76d9734fa1bd64cb0208ed4aca7f251cee6f4b4e111e301eb948946
-  data.tar.gz: 23a2dfe059d46d550f797ae7ffe4a33e7dabac58e34eff48748466147ac0de63597ca1593bb9d54f32baca3edc5756ce3bd2d173d01465081b655e234d1d29d1
+  metadata.gz: d75464dfcacaa20d34ac497a6c9d949ac5d9f8161e313268c68bd4dd926696c1069326167cc6e7475fafb3a2d9384b225836a3d15b71a1ed6f36d0f65e971652
+  data.tar.gz: f77217f8bff00303217370b7688a1601ebb0314196ad9490cca592059687c57ad0fdb508b02dcd47c5014605e4add6231407a13dde42507ae4287bda1cd4d2b9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    toccatore (0.3.6)
+    toccatore (0.3.8)
       activesupport (~> 4.2, >= 4.2.5)
       dotenv (~> 2.1, >= 2.1.1)
       gender_detector (~> 1.0)
@@ -18,7 +18,7 @@ GEM
       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)
     builder (3.2.3)
     codeclimate-test-reporter (1.0.8)
@@ -38,24 +38,24 @@ GEM
     gender_detector (1.0.0)
     hashdiff (0.3.2)
     i18n (0.8.1)
-    json (2.0.3)
-    maremma (3.5.1)
-      activesupport (~> 4.2, >= 4.2.5)
+    json (2.1.0)
+    maremma (3.5.7)
+      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)
+      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)
+    multi_json (1.12.1)
     multipart-post (2.0.0)
     namae (0.11.3)
-    nokogiri (1.6.8.1)
+    nokogiri (1.7.1)
       mini_portile2 (~> 2.1.0)
     oj (2.18.5)
     public_suffix (2.0.5)

data/README.md

@@ -4,7 +4,7 @@
 [![Code Climate](https://codeclimate.com/github/datacite/toccatore/badges/gpa.svg)](https://codeclimate.com/github/datacite/toccatore)
 [![Test Coverage](https://codeclimate.com/github/datacite/toccatore/badges/coverage.svg)](https://codeclimate.com/github/datacite/toccatore/coverage)
 
-Command-line client for finding ORCID IDs and DOIs not from DataCite as related identifiers in DataCite metadata.
+Agent for Event Data service, providing links to ORCID IDs and DOIs not from DataCite as related identifiers in DataCite metadata.
 
 ## Development
 

data/lib/toccatore/base.rb

@@ -67,17 +67,20 @@ module Toccatore
       if total > 0
         # walk through paginated results
         total_pages = (total.to_f / job_batch_size).ceil
+        error_total = 0
 
         (0...total_pages).each do |page|
           options[:offset] = page * job_batch_size
-          process_data(options)
+          options[:total] = total
+          error_total += process_data(options)
         end
-        text = "#{total} works processed for date range #{options[:from_date]} - #{options[:until_date]}."
+        text = "#{total} works processed with #{error_total} errors for date range #{options[:from_date]} - #{options[:until_date]}."
       else
         text = "No works found for date range #{options[:from_date]} - #{options[:until_date]}."
-        puts text
       end
 
+      puts text
+
       # send slack notification
       options[:level] = total > 0 ? "good" : "warning"
       options[:title] = "Report for #{source_id}"
@@ -101,13 +104,20 @@ module Toccatore
       Maremma.get(query_url, options)
     end
 
+    # method returns number of errors
     def push_data(items, options={})
       if items.empty?
         puts "No works found for date range #{options[:from_date]} - #{options[:until_date]}."
+        0
       elsif options[:access_token].blank?
         puts "An error occured: Access token missing."
+        options[:total]
       else
-        Array(items).each { |item| push_item(item, options) }
+        error_total = 0
+        Array(items).each do |item|
+          error_total += push_item(item, options)
+        end
+        error_total
       end
     end
 

data/lib/toccatore/datacite_related.rb

@@ -2,6 +2,8 @@ require_relative 'base'
 
 module Toccatore
   class DataciteRelated < Base
+    LICENSE = "https://creativecommons.org/publicdomain/zero/1.0/"
+
     def source_id
       "datacite_related"
     end
@@ -43,7 +45,8 @@ module Toccatore
                         "relation_type_id" => raw_relation_type.underscore,
                         "source_id" => "datacite",
                         "source_token" => options[:source_token],
-                        "occurred_at" => item.fetch("minted") }
+                        "occurred_at" => item.fetch("minted"),
+                        "license" => LICENSE }
             else
               ssum
             end
@@ -76,10 +79,14 @@ module Toccatore
                                           host: host)
       end
 
+      # return 0 if successful, 1 if error
       if response.status == 201
         puts "#{item['subj_id']} #{item['relation_type_id']} #{item['obj_id']} pushed to Event Data service."
+        0
       elsif response.body["errors"].present?
-        puts "An error occured: #{response.body['errors'].first['title']}"
+        puts "#{item['subj_id']} #{item['relation_type_id']} #{item['obj_id']} had an error:"
+        puts "#{response.body['errors'].first['title']}"
+        1
       end
     end
   end

data/lib/toccatore/orcid_update.rb

@@ -56,8 +56,11 @@ module Toccatore
         orcid = response.body.fetch("data", {}).fetch("attributes", {}).fetch("orcid", nil)
         claim_action = response.body.fetch("data", {}).fetch("attributes", {}).fetch("claim-action", nil)
         puts "#{claim_action.titleize} DOI #{doi} for ORCID ID #{orcid} pushed to Profiles service."
+        0
       elsif response.body["errors"].present?
-        puts "An error occured: #{response.body['errors'].first['title']}"
+        puts "#{claim_action.titleize} DOI #{doi} for ORCID ID #{orcid} had an error:"
+        puts "#{response.body['errors'].first['title']}"
+        1
       end
     end
   end

data/lib/toccatore/version.rb

@@ -1,3 +1,3 @@
 module Toccatore
-  VERSION = "0.3.6"
+  VERSION = "0.3.8"
 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.3.6\n").to_stdout
+      expect { subject.__print_version }.to output("0.3.8\n").to_stdout
     end
   end
 

data/spec/datacite_related_spec.rb

@@ -102,7 +102,7 @@ describe Toccatore::DataciteRelated, vcr: true do
       response = subject.parse_data(result, source_token: ENV['SOURCE_TOKEN'])
 
       expect(response.length).to eq(134)
-      expect(response.last.except("id")).to eq("message_action" => "create", "subj_id"=>"https://doi.org/10.17180/obs.yzeron", "obj_id"=>"https://doi.org/10.1016/j.jhydrol.2013.09.055", "relation_type_id"=>"is_referenced_by", "source_id"=>"datacite","source_token" => "28276d12-b320-41ba-9272-bb0adc3466ff", "occurred_at"=>"2015-04-07T12:22:40Z")
+      expect(response.last.except("id")).to eq("message_action" => "create", "subj_id"=>"https://doi.org/10.17180/obs.yzeron", "obj_id"=>"https://doi.org/10.1016/j.jhydrol.2013.09.055", "relation_type_id"=>"is_referenced_by", "source_id"=>"datacite","source_token" => "28276d12-b320-41ba-9272-bb0adc3466ff", "occurred_at"=>"2015-04-07T12:22:40Z", "license" => "https://creativecommons.org/publicdomain/zero/1.0/")
     end
 
     it "should report if there are works ignored because of an IsIdenticalTo relation" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toccatore
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.8
 platform: ruby
 authors:
 - Martin Fenner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-29 00:00:00.000000000 Z
+date: 2017-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: maremma