toccatore 0.1 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13870f2c02d23ff37a9f4de7af84bfa353af388d
-  data.tar.gz: a356318891ee353f9dab772c9f74b1629a21b6dc
+  metadata.gz: 53ede9be3b0700d3355c2c77084cdc23a2107f05
+  data.tar.gz: f5ba51ea0e1541d3fd03678f1d724672d444d79a
 SHA512:
-  metadata.gz: 63cd648459e66ce0bda3434ec311e35b12fd66d617882cb59c78a1c9091a6448c9ff2f43c0bd187d1b27c8e0cfabfd861f11325d73de8245be8419f3f79a6086
-  data.tar.gz: c0a6a5c484535dace3a5a677e73c97858f3f27bcab2383917d9d7ea631242abd869ed85b6d5eca275a87ab55ac072938b2a6c96093e50cdc13d3b259fea2573c
+  metadata.gz: 9d194a51974f6896f8ea00fb50895ad510612e788e7d84fb3a1b399e2ff727aa2a6d8978c8be3cc2dfff29bd8676743d8ddd8416813ccd0e64c8f3dc5a2c0769
+  data.tar.gz: 9276f36b39523aef67e1075034ac804811441da779aaddaf0ee576d8f93bcaf0424a671550061c1268fd9eb3e7c5fde32291e3e0a5baec4d0d28d62d9cc3f62b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    toccatore (0.1)
+    toccatore (0.1.1)
       activesupport (~> 4.2, >= 4.2.5)
       dotenv (~> 2.1, >= 2.1.1)
       gender_detector (~> 1.0)

data/lib/toccatore/base.rb

@@ -1,3 +1,5 @@
+require 'maremma'
+require 'active_support/all'
 require 'namae'
 require 'gender_detector'
 
@@ -63,8 +65,8 @@ module Toccatore
       data = get_data(options.merge(timeout: timeout, source_id: source_id))
       data = parse_data(data, options.merge(source_id: source_id))
 
-      # push to deposit API if no error and we have collected works and/or events
-      # returns hash with number of deposits created, e.g. { total: 10 }
+      return [OpenStruct.new(body: { "data" => [] })] if data.empty?
+
       push_data(data, options)
     end
 

data/lib/toccatore/cli.rb

@@ -19,18 +19,27 @@ module Toccatore
 
     desc "orcid_update", "push ORCID IDs from DataCite MDS to ORCID"
     method_option :access_token, type: :string, required: true
-    method_option :from_date, type: :string
-    method_option :until_date, type: :string
+    method_option :from_date, type: :string, default: (Time.now.to_date - 1.day).iso8601
+    method_option :until_date, type: :string, default: Time.now.to_date.iso8601
     method_option :push_url, type: :string
     def orcid_update
       orcid_update = Toccatore::OrcidUpdate.new
-      orcid_update.process_data(options).each do |response|
-        if response.body["data"].present?
-          doi = response.body.fetch("data", {}).fetch("attributes", {}).fetch("doi", nil)
-          orcid = response.body.fetch("data", {}).fetch("attributes", {}).fetch("orcid", nil)
-          puts "DOI #{doi} for ORCID ID #{orcid} pushed to Profiles service."
-        elsif response.body["errors"].present?
-          puts "An error occured: #{response.body['errors'].first['title']}"
+
+      data = orcid_update.get_data(options.merge(timeout: orcid_update.timeout, source_id: orcid_update.source_id))
+      data = orcid_update.parse_data(data, options.merge(source_id: orcid_update.source_id))
+
+      if data.empty?
+        puts "No works found for date range #{options[:from_date]} - #{options[:until_date]}."
+      else
+        data.each do |item|
+          response = orcid_update.push_item(item, options)
+          if response.body["data"].present?
+            doi = response.body.fetch("data", {}).fetch("attributes", {}).fetch("doi", nil)
+            orcid = response.body.fetch("data", {}).fetch("attributes", {}).fetch("orcid", nil)
+            puts "DOI #{doi} for ORCID ID #{orcid} pushed to Profiles service."
+          elsif response.body["errors"].present?
+            puts "An error occured: #{response.body['errors'].first['title']}"
+          end
         end
       end
     end

data/lib/toccatore/orcid_update.rb

@@ -40,17 +40,17 @@ module Toccatore
 
     # push to Volpino API if no error and we have collected works
     def push_data(items, options={})
-      push_url = (options[:push_url].presence || "https://profiles.datacite.org/api") + "/claims"
-      access_token = options[:access_token]
+      Array(items).map { |item| push_item(item, options) }
+    end
 
-      return [] if items.empty?
-      return [OpenStruct.new(body: { "errors" => [{ "title" => "Access token missing" }] })] if access_token.blank?
+    def push_item(item, options={})
+      return OpenStruct.new(body: { "errors" => [{ "title" => "Access token missing." }] }) if options[:access_token].blank?
 
-      Array(items).map do |item|
-        Maremma.post(push_url, data: { "claim" => item }.to_json,
-                               token: access_token,
-                               content_type: 'json')
-      end
+      push_url = (options[:push_url].presence || "https://profiles.datacite.org/api") + "/claims"
+
+      Maremma.post(push_url, data: { "claim" => item }.to_json,
+                             token: options[:access_token],
+                             content_type: 'json')
     end
   end
 end

data/lib/toccatore/version.rb

@@ -1,3 +1,3 @@
 module Toccatore
-  VERSION = "0.1"
+  VERSION = "0.1.1"
 end

data/lib/toccatore.rb

@@ -1 +1,2 @@
 require "toccatore/orcid_update"
+require "toccatore/cli"

data/spec/cli_spec.rb

@@ -21,9 +21,19 @@ describe Toccatore::CLI do
       expect { subject.orcid_update }.to output(/DOI 10.6084\/M9.FIGSHARE.1041547 for ORCID ID 0000-0002-3546-1048 pushed to Profiles service.\n/).to_stdout
     end
 
+    it 'should succeed with no works' do
+      from_date = "2009-04-07"
+      until_date = "2009-04-08"
+      subject.options = { push_url: push_url,
+                          access_token: access_token,
+                          from_date: from_date,
+                          until_date: until_date }
+      expect { subject.orcid_update }.to output("No works found for date range 2009-04-07 - 2009-04-08.\n").to_stdout
+    end
+
     it 'should fail' do
       subject.options = cli_options.except(:access_token)
-      expect { subject.orcid_update }.to output("An error occured: Access token missing\n").to_stdout
+      expect { subject.orcid_update }.to output(/An error occured: Access token missing.\n/).to_stdout
     end
   end
 end

data/spec/fixtures/vcr_cassettes/Toccatore_CLI/orcid_update/should_succeed_with_no_works.yml

@@ -0,0 +1,38 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://search.datacite.org/api?fl=doi,creator,title,publisher,publicationYear,resourceTypeGeneral,datacentre_symbol,relatedIdentifier,nameIdentifier,xml,minted,updated&fq=updated:%5B2009-04-07T00:00:00Z%20TO%202009-04-08T23:59:59Z%5D%20AND%20has_metadata:true%20AND%20is_active:true&q=nameIdentifier:ORCID%5C:*&rows=1000&start=0&wt=json
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Maremma - https://github.com/datacite/maremma
+      Accept:
+      - text/html,application/json,application/xml;q=0.9, text/plain;q=0.8,image/png,*/*;q=0.5
+  response:
+    status:
+      code: 200
+      message: ''
+    headers:
+      Server:
+      - openresty/1.11.2.1
+      Date:
+      - Mon, 30 Jan 2017 09:15:48 GMT
+      Content-Type:
+      - application/json;charset=UTF-8
+      Connection:
+      - keep-alive
+      Access-Control-Allow-Origin:
+      - "*"
+      Access-Control-Allow-Methods:
+      - GET, POST, OPTIONS
+    body:
+      encoding: UTF-8
+      string: '{"responseHeader":{"status":0,"QTime":1},"response":{"numFound":0,"start":0,"docs":[]}}
+
+'
+    http_version: 
+  recorded_at: Mon, 30 Jan 2017 09:15:48 GMT
+recorded_with: VCR 3.0.3

data/spec/orcid_update_spec.rb

@@ -97,7 +97,8 @@ describe Toccatore::OrcidUpdate, vcr: true do
   context "push_data" do
     it "should report if there are no works returned by the Datacite Metadata Search API" do
       result = []
-      expect(subject.push_data(result)).to be_empty
+      response = subject.push_data(result)
+      expect(response.count).to eq(0)
     end
 
     it "should report if there are works returned by the Datacite Metadata Search API" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: toccatore
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: 0.1.1
 platform: ruby
 authors:
 - Martin Fenner
@@ -262,6 +262,7 @@ files:
 - spec/fixtures/orcid_update_nil.json
 - spec/fixtures/vcr_cassettes/Toccatore_CLI/orcid_update/should_fail.yml
 - spec/fixtures/vcr_cassettes/Toccatore_CLI/orcid_update/should_succeed.yml
+- spec/fixtures/vcr_cassettes/Toccatore_CLI/orcid_update/should_succeed_with_no_works.yml
 - spec/fixtures/vcr_cassettes/Toccatore_OrcidUpdate/get_data/should_report_if_there_are_no_works_returned_by_the_Datacite_Metadata_Search_API.yml
 - spec/fixtures/vcr_cassettes/Toccatore_OrcidUpdate/get_data/should_report_if_there_are_works_returned_by_the_Datacite_Metadata_Search_API.yml
 - spec/fixtures/vcr_cassettes/Toccatore_OrcidUpdate/get_total/with_no_works.yml
@@ -292,23 +293,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Ruby library to find ORCID IDs in the DataCite Solr index
-test_files:
-- spec/cli_spec.rb
-- spec/fixtures/orcid_update.json
-- spec/fixtures/orcid_update_nil.json
-- spec/fixtures/vcr_cassettes/Toccatore_CLI/orcid_update/should_fail.yml
-- spec/fixtures/vcr_cassettes/Toccatore_CLI/orcid_update/should_succeed.yml
-- spec/fixtures/vcr_cassettes/Toccatore_OrcidUpdate/get_data/should_report_if_there_are_no_works_returned_by_the_Datacite_Metadata_Search_API.yml
-- spec/fixtures/vcr_cassettes/Toccatore_OrcidUpdate/get_data/should_report_if_there_are_works_returned_by_the_Datacite_Metadata_Search_API.yml
-- spec/fixtures/vcr_cassettes/Toccatore_OrcidUpdate/get_total/with_no_works.yml
-- spec/fixtures/vcr_cassettes/Toccatore_OrcidUpdate/get_total/with_works.yml
-- spec/fixtures/vcr_cassettes/Toccatore_OrcidUpdate/push_data/should_report_if_there_are_works_returned_by_the_Datacite_Metadata_Search_API.yml
-- spec/fixtures/vcr_cassettes/Toccatore_OrcidUpdate/queue_jobs/should_report_if_there_are_no_works_returned_by_the_Datacite_Metadata_Search_API.yml
-- spec/fixtures/vcr_cassettes/Toccatore_OrcidUpdate/queue_jobs/should_report_if_there_are_works_returned_by_the_Datacite_Metadata_Search_API.yml
-- spec/orcid_update_spec.rb
-- spec/spec_helper.rb
-has_rdoc: 
+test_files: []