toccatore 0.2 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a9e3668e6d812e727b1ccbeedfc424d773a6033
-  data.tar.gz: 6b0d6168376296443570485308965df70de63026
+  metadata.gz: 42293b18d16efba366c96b902b4afdbda27e1c0c
+  data.tar.gz: 449ce93c8348885f619907c0eda997e3c51d079a
 SHA512:
-  metadata.gz: 3dd61f043ee767072eb2d828bd34bd77a9f9c0a67bcc2e285e01a6d37d2699d8f7330d0fb2b097e704ece372a695e98d142268a5b9175d4bf9af2131218d1098
-  data.tar.gz: 0ad6ae126d03d02e18a05a6ccd53d96591a2bbd6a0729445a05b9fda4433a70b8ff1d796fcee8e182ad2c7072c4e5a6b5530c5bbaffdd6ae525ca1784232a956
+  metadata.gz: 3f1992999cb94249db3d154025c587b6158449bb68111f3ac87e463cdb98025ebbddaa09a9945b0fadd43f5323f3bc92119738b1dee09d01b681a4a8fa37462e
+  data.tar.gz: 4eb82b6dd46ae1e7be78b87e44087d3c1ac41bc0fe64c5220e62a63a5117965e13d005b2c63ef7edbee62341f24c4d29b2a2bae146cb614fcc138257a1e0d8cf

data/Gemfile.lock

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

data/lib/toccatore/base.rb

@@ -23,7 +23,16 @@ module Toccatore
     def get_query_url(options={})
       updated = "updated:[#{options[:from_date]}T00:00:00Z TO #{options[:until_date]}T23:59:59Z]"
       fq = "#{updated} AND has_metadata:true AND is_active:true"
-      q = options[:query].presence || query
+
+      if options[:doi].present?
+        q = "doi:#{options[:doi]}"
+      elsif options[:orcid].present?
+        q = "nameIdentifier:ORCID\\:#{options[:orcid]}"
+      elsif options[:query].present?
+        q = options[:query]
+      else
+        q = query
+      end
 
       params = { q: q,
                  start: options[:offset],
@@ -358,6 +367,12 @@ module Toccatore
     def name_detector
       GenderDetector.new
     end
+
+    def unfreeze(hsh)
+      new_hash = {}
+      hsh.each_pair { |k,v| new_hash.merge!({k.downcase.to_sym => v})  }
+      new_hash
+    end
   end
 end
 

data/lib/toccatore/cli.rb

@@ -22,15 +22,13 @@ module Toccatore
     method_option :push_url, 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 :query, type: :string
+    method_option :q, type: :string
     method_option :orcid, type: :string
     method_option :doi, type: :string
+    method_option :claim_action, type: :string, default: "create"
     def orcid_update
-      options[:query] = "doi:#{options[:doi]}" if options[:doi].present?
-      options[:query] = "nameIdentifier:ORCID\\:#{options[:orcid]}" if options[:orcid].present?
-
       orcid_update = Toccatore::OrcidUpdate.new
-      orcid_update.queue_jobs(options)
+      orcid_update.queue_jobs(orcid_update.unfreeze(options))
     end
   end
 end

data/lib/toccatore/orcid_update.rb

@@ -14,12 +14,17 @@ module Toccatore
       return result.body.fetch("errors") if result.body.fetch("errors", nil).present?
 
       items = result.body.fetch("data", {}).fetch('response', {}).fetch('docs', nil)
+      claim_action = options[:claim_action].presence || "create"
 
       Array(items).reduce([]) do |sum, item|
         doi = item.fetch("doi")
+        related_identifiers = item.fetch("relatedIdentifier", [])
+        skip_doi = related_identifiers.any? do |related_identifier|
+          ["IsIdenticalTo", "IsPartOf"].include?(related_identifier.split(':', 3).first)
+        end
         name_identifiers = item.fetch("nameIdentifier", [])
 
-        if name_identifiers.blank?
+        if name_identifiers.blank? || (skip_doi && claim_action == "create") || (!skip_doi && claim_action == "delete")
           sum
         else
           name_identifiers.each do |name_identifier|
@@ -31,7 +36,7 @@ module Toccatore
             sum << { "orcid" => orcid,
                      "doi" => doi,
                      "source_id" => source_id,
-                     "claim_action"=>"create" }
+                     "claim_action"=> claim_action }
           end
           sum
         end
@@ -60,7 +65,8 @@ module Toccatore
       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."
+        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."
       elsif response.body["errors"].present?
         puts "An error occured: #{response.body['errors'].first['title']}"
       end

data/lib/toccatore/version.rb

@@ -1,3 +1,3 @@
 module Toccatore
-  VERSION = "0.2"
+  VERSION = "0.2.2"
 end

data/spec/cli_spec.rb

@@ -26,6 +26,11 @@ describe Toccatore::CLI do
       expect { subject.orcid_update }.to output(/DOI 10.5438\/6423 for ORCID ID 0000-0001-5331-6592 pushed to Profiles service.\n/).to_stdout
     end
 
+    it 'should delete' do
+      subject.options = cli_options.merge(doi: "10.6084/M9.FIGSHARE.4126869.V1", from_date: "2013-01-01", until_date: "2016-12-31", claim_action: "delete")
+      expect { subject.orcid_update }.to output(/Delete DOI 10.6084\/M9.FIGSHARE.4126869.V1 for ORCID ID 0000-0003-1013-1533 pushed to Profiles service.\n/).to_stdout
+    end
+
     it 'should query by ORCID ID' do
       subject.options = cli_options.merge(orcid: "0000-0002-3546-1048", from_date: "2013-01-01", until_date: "2016-12-31")
       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

data/spec/fixtures/orcid_update_is_identical.json

@@ -0,0 +1,24 @@
+{
+    "responseHeader": {
+        "status": 0,
+        "QTime": 0
+    },
+    "response": {
+        "numFound": 1,
+        "start": 0,
+        "docs": [{
+            "minted": "2016-10-28T21:43:49Z",
+            "datacentre_symbol": "FIGSHARE.ARS",
+            "xml": "PHJlc291cmNlIHhtbG5zPSJodHRwOi8vZGF0YWNpdGUub3JnL3NjaGVtYS9rZXJuZWwtMyIgeG1sbnM6eHNpPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxL1hNTFNjaGVtYS1pbnN0YW5jZSIgeHNpOnNjaGVtYUxvY2F0aW9uPSJodHRwOi8vZGF0YWNpdGUub3JnL3NjaGVtYS9rZXJuZWwtMyBodHRwOi8vc2NoZW1hLmRhdGFjaXRlLm9yZy9tZXRhL2tlcm5lbC0zL21ldGFkYXRhLnhzZCI+PGlkZW50aWZpZXIgaWRlbnRpZmllclR5cGU9IkRPSSI+MTAuNjA4NC9tOS5maWdzaGFyZS40MTI2ODY5LnYxPC9pZGVudGlmaWVyPjxjcmVhdG9ycz48Y3JlYXRvcj48Y3JlYXRvck5hbWU+U2hpcmxleSBaaGFvPC9jcmVhdG9yTmFtZT48bmFtZUlkZW50aWZpZXIgbmFtZUlkZW50aWZpZXJTY2hlbWU9Ik9SQ0lEIiBzY2hlbWVVUkk9Imh0dHA6Ly9vcmNpZC5vcmciPjAwMDAtMDAwMy0xMDEzLTE1MzM8L25hbWVJZGVudGlmaWVyPjwvY3JlYXRvcj48L2NyZWF0b3JzPjx0aXRsZXM+PHRpdGxlPkluZm9ybWF0aW9uIEVsZXZhdGVkJTNBIEpvaW4gdGhlIFV0YWggU29jaWV0eSBvZiBIZWFsdGggU2NpZW5jZXMgTGlicmFyaWFuczwvdGl0bGU+PC90aXRsZXM+PGRlc2NyaXB0aW9ucz48ZGVzY3JpcHRpb24gZGVzY3JpcHRpb25UeXBlPSJBYnN0cmFjdCI+VGhlIFV0YWggU29jaWV0eSBvZiBIZWFsdGggU2NpZW5jZXMgTGlicmFyaWFucyAoVVNIU0wpIHN1cHBvcnRzIGxpYnJhcnkgcHJvZmVzc2lvbmFscyBpbiBVdGFoIHdobyBoYXZlIGFuIGludGVyZXN0IGluIGltcHJvdmluZyB0aGVpciBza2lsbHMgYXMgaGVhbHRoIGluZm9ybWF0aW9uIHByb3ZpZGVycy4gJmx0O2JyJmd0OzwvZGVzY3JpcHRpb24+PC9kZXNjcmlwdGlvbnM+PHN1YmplY3RzPjxzdWJqZWN0PkxpYnJhcnkgYW5kIEluZm9ybWF0aW9uIFN0dWRpZXM8L3N1YmplY3Q+PHN1YmplY3Qgc2NoZW1lVVJJPSJodHRwOi8vd3d3LmFicy5nb3YuYXUvYXVzc3RhdHMvYWJzQC5uc2YvMC82QkI0MjdBQjk2OTZDMjI1Q0EyNTc0MTgwMDA0NDYzRSIgc3ViamVjdFNjaGVtZT0iRk9SIj4xMTk5OTkgTWVkaWNhbCBhbmQgSGVhbHRoIFNjaWVuY2VzIG5vdCBlbHNld2hlcmUgY2xhc3NpZmllZDwvc3ViamVjdD48L3N1YmplY3RzPjxwdWJsaXNoZXI+Rmlnc2hhcmU8L3B1Ymxpc2hlcj48cHVibGljYXRpb25ZZWFyPjIwMTY8L3B1YmxpY2F0aW9uWWVhcj48ZGF0ZXM+PGRhdGUgZGF0ZVR5cGU9IkNyZWF0ZWQiPjIwMTYtMTAtMjg8L2RhdGU+PGRhdGUgZGF0ZVR5cGU9IlVwZGF0ZWQiPjIwMTYtMTAtMjg8L2RhdGU+PC9kYXRlcz48cmVzb3VyY2VUeXBlIHJlc291cmNlVHlwZUdlbmVyYWw9IkltYWdlIj5Qb3N0ZXI8L3Jlc291cmNlVHlwZT48c2l6ZXM+PHNpemU+NTM1MzI5IEJ5dGVzPC9zaXplPjwvc2l6ZXM+PHJlbGF0ZWRJZGVudGlmaWVycz48cmVsYXRlZElkZW50aWZpZXIgcmVsYXRlZElkZW50aWZpZXJUeXBlPSJET0kiIHJlbGF0aW9uVHlwZT0iSXNJZGVudGljYWxUbyI+MTAuNjA4NC9tOS5maWdzaGFyZS40MTI2ODY5PC9yZWxhdGVkSWRlbnRpZmllcj48L3JlbGF0ZWRJZGVudGlmaWVycz48cmlnaHRzTGlzdD48cmlnaHRzIHJpZ2h0c1VSST0iaHR0cHM6Ly9jcmVhdGl2ZWNvbW1vbnMub3JnL2xpY2Vuc2VzL2J5LzQuMC8iPkNDLUJZPC9yaWdodHM+PC9yaWdodHNMaXN0PjwvcmVzb3VyY2U+",
+            "updated": "2016-10-28T21:44:42Z",
+            "doi": "10.6084/M9.FIGSHARE.4126869.V1",
+            "publisher": "Figshare",
+            "creator": ["Shirley Zhao"],
+            "title": ["Information Elevated%3A Join the Utah Society of Health Sciences Librarians"],
+            "resourceTypeGeneral": "Image",
+            "relatedIdentifier": ["IsIdenticalTo:DOI:10.6084/m9.figshare.4126869"],
+            "nameIdentifier": ["ORCID:0000-0003-1013-1533"],
+            "publicationYear": "2016"
+        }]
+    }
+}

data/spec/fixtures/orcid_update_is_part.json

@@ -0,0 +1,24 @@
+{
+    "responseHeader": {
+        "status": 0,
+        "QTime": 2
+    },
+    "response": {
+        "numFound": 1,
+        "start": 0,
+        "docs": [{
+            "minted": "2016-12-17T09:20:41Z",
+            "datacentre_symbol": "BL.IMPERIAL",
+            "xml": "PHJlc291cmNlIHhtbG5zOnhzaT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS9YTUxTY2hlbWEtaW5zdGFuY2UiIHhtbG5zPSJodHRwOi8vZGF0YWNpdGUub3JnL3NjaGVtYS9rZXJuZWwtNCIgeHNpOnNjaGVtYUxvY2F0aW9uPSJodHRwOi8vZGF0YWNpdGUub3JnL3NjaGVtYS9rZXJuZWwtNCBodHRwOi8vc2NoZW1hLmRhdGFjaXRlLm9yZy9tZXRhL2tlcm5lbC00L21ldGFkYXRhLnhzZCI+CiAgPGlkZW50aWZpZXIgaWRlbnRpZmllclR5cGU9IkRPSSI+MTAuMTQ0NjkvaHBjLzE5ODU8L2lkZW50aWZpZXI+CiAgPGNyZWF0b3JzPgogICAgPGNyZWF0b3I+CiAgICAgIDxjcmVhdG9yTmFtZT5IZW5yeSBSemVwYTwvY3JlYXRvck5hbWU+CiAgICAgIDxuYW1lSWRlbnRpZmllciBzY2hlbWVVUkk9Imh0dHA6Ly9vcmNpZC5vcmciIG5hbWVJZGVudGlmaWVyU2NoZW1lPSJPUkNJRCI+MDAwMC0wMDAyLTg2MzUtODM5MDwvbmFtZUlkZW50aWZpZXI+CiAgICAgIDxhZmZpbGlhdGlvbj5JbXBlcmlhbCBDb2xsZWdlIExvbmRvbjwvYWZmaWxpYXRpb24+CiAgICA8L2NyZWF0b3I+CiAgPC9jcmVhdG9ycz4KICA8Y29udHJpYnV0b3JzPgogICAgPGNvbnRyaWJ1dG9yIGNvbnRyaWJ1dG9yVHlwZT0iSG9zdGluZ0luc3RpdHV0aW9uIj4KICAgICAgPGNvbnRyaWJ1dG9yTmFtZT5JbXBlcmlhbCBDb2xsZWdlIExvbmRvbjwvY29udHJpYnV0b3JOYW1lPgogICAgPC9jb250cmlidXRvcj4KICAgIDxjb250cmlidXRvciBjb250cmlidXRvclR5cGU9IkRhdGFNYW5hZ2VyIj4KICAgICAgPGNvbnRyaWJ1dG9yTmFtZT5JbXBlcmlhbCBDb2xsZWdlIEhpZ2ggUGVyZm9ybWFuY2UgQ29tcHV0aW5nIFNlcnZpY2U8L2NvbnRyaWJ1dG9yTmFtZT4KICAgIDwvY29udHJpYnV0b3I+CiAgICA8Y29udHJpYnV0b3IgY29udHJpYnV0b3JUeXBlPSJSZXNlYXJjaGVyIj4KICAgICAgPGNvbnRyaWJ1dG9yTmFtZT5IZW5yeSBSemVwYTwvY29udHJpYnV0b3JOYW1lPgogICAgICA8bmFtZUlkZW50aWZpZXIgc2NoZW1lVVJJPSJodHRwOi8vb3JjaWQub3JnIiBuYW1lSWRlbnRpZmllclNjaGVtZT0iT1JDSUQiPjAwMDAtMDAwMi04NjM1LTgzOTA8L25hbWVJZGVudGlmaWVyPgogICAgICA8YWZmaWxpYXRpb24+SW1wZXJpYWwgQ29sbGVnZSBMb25kb248L2FmZmlsaWF0aW9uPgogICAgPC9jb250cmlidXRvcj4KICA8L2NvbnRyaWJ1dG9ycz4KICA8ZGVzY3JpcHRpb25zPgogICAgPGRlc2NyaXB0aW9uIGRlc2NyaXB0aW9uVHlwZT0iT3RoZXIiPlFUQUlNIGFuYWx5c2lzIG9mIENyIHN5c3RlbSB3aXRoIHRocmVlIGRpZmZlcmVudCB0eXBlcyBvZiBDck4gYm9uZC48L2Rlc2NyaXB0aW9uPgogIDwvZGVzY3JpcHRpb25zPgogIDx0aXRsZXM+CiAgICA8dGl0bGU+Q3JOMTIzOiBRVEFJTSBhbmFseXNpczwvdGl0bGU+CiAgPC90aXRsZXM+CiAgPHB1Ymxpc2hlcj5JbXBlcmlhbCBDb2xsZWdlIExvbmRvbjwvcHVibGlzaGVyPgogIDxwdWJsaWNhdGlvblllYXI+MjAxNjwvcHVibGljYXRpb25ZZWFyPgogIDxkYXRlcz4KICAgIDxkYXRlIGRhdGVUeXBlPSJDcmVhdGVkIj4yMDE2LTEyLTE3IDA5OjIwOjM3LjkyNTIwOTwvZGF0ZT4KICAgIDxkYXRlIGRhdGVUeXBlPSJVcGRhdGVkIj4yMDE2LTEyLTE3IDEwOjAwOjEwLjEzODU2MzwvZGF0ZT4KICA8L2RhdGVzPgogIDxyZWxhdGVkSWRlbnRpZmllcnM+CiAgICA8cmVsYXRlZElkZW50aWZpZXIgcmVsYXRlZElkZW50aWZpZXJUeXBlPSJVUkwiIHJlbGF0aW9uVHlwZT0iSGFzTWV0YWRhdGEiIHJlbGF0ZWRNZXRhZGF0YVNjaGVtZT0iT1JFIiBzY2hlbWVVUkk9Imh0dHA6Ly93d3cub3BlbmFyY2hpdmVzLm9yZy9vcmUvIj5odHRwczovL2RhdGEuaHBjLmltcGVyaWFsLmFjLnVrL3Jlc29sdmUvP29yZT0xOTg1PC9yZWxhdGVkSWRlbnRpZmllcj4KICAgIDxyZWxhdGVkSWRlbnRpZmllciByZWxhdGVkSWRlbnRpZmllclR5cGU9IlVSTCIgcmVsYXRpb25UeXBlPSJIYXNQYXJ0IiByZWxhdGVkTWV0YWRhdGFTY2hlbWU9IkZpbGVuYW1lIiBzY2hlbWVVUkk9ImZpbGVuYW1lOi8vWTNKdU15NXRaM0E9Ij5odHRwczovL2RhdGEuaHBjLmltcGVyaWFsLmFjLnVrL3Jlc29sdmUvP2RvaT0xOTg1JmFtcDtmaWxlPTE8L3JlbGF0ZWRJZGVudGlmaWVyPgogICAgPHJlbGF0ZWRJZGVudGlmaWVyIHJlbGF0ZWRJZGVudGlmaWVyVHlwZT0iVVJMIiByZWxhdGlvblR5cGU9Ikhhc1BhcnQiIHJlbGF0ZWRNZXRhZGF0YVNjaGVtZT0iRmlsZW5hbWUiIHNjaGVtZVVSST0iZmlsZW5hbWU6Ly9ZM0p1TXk1M1ptND0iPmh0dHBzOi8vZGF0YS5ocGMuaW1wZXJpYWwuYWMudWsvcmVzb2x2ZS8/ZG9pPTE5ODUmYW1wO2ZpbGU9MjwvcmVsYXRlZElkZW50aWZpZXI+CiAgICA8cmVsYXRlZElkZW50aWZpZXIgcmVsYXRlZElkZW50aWZpZXJUeXBlPSJVUkwiIHJlbGF0aW9uVHlwZT0iSGFzUGFydCIgcmVsYXRlZE1ldGFkYXRhU2NoZW1lPSJGaWxlbmFtZSIgc2NoZW1lVVJJPSJmaWxlbmFtZTovL1kzSnVNeTV0WjNCMmFYbz0iPmh0dHBzOi8vZGF0YS5ocGMuaW1wZXJpYWwuYWMudWsvcmVzb2x2ZS8/ZG9pPTE5ODUmYW1wO2ZpbGU9MzwvcmVsYXRlZElkZW50aWZpZXI+CiAgICA8cmVsYXRlZElkZW50aWZpZXIgcmVsYXRlZElkZW50aWZpZXJUeXBlPSJET0kiIHJlbGF0aW9uVHlwZT0iSXNSZWZlcmVuY2VkQnkiPjEwLjE0NDY5L2hwYy8xOTg2PC9yZWxhdGVkSWRlbnRpZmllcj4KICAgIDxyZWxhdGVkSWRlbnRpZmllciByZWxhdGVkSWRlbnRpZmllclR5cGU9IkRPSSIgcmVsYXRpb25UeXBlPSJJc1BhcnRPZiI+MTAuMTQ0NjkvaHBjLzE3NzwvcmVsYXRlZElkZW50aWZpZXI+CiAgPC9yZWxhdGVkSWRlbnRpZmllcnM+CiAgPHN1YmplY3RzLz4KICA8cmlnaHRzTGlzdD4KICAgIDxyaWdodHMgcmlnaHRzVVJJPSJodHRwczovL2NyZWF0aXZlY29tbW9ucy5vcmcvcHVibGljZG9tYWluL3plcm8vMS4wLyI+Q3JlYXRpdmUgQ29tbW9ucyBQdWJsaWMgRG9tYWluIERlZGljYXRpb24gKENDMCAxLjApPC9yaWdodHM+CiAgPC9yaWdodHNMaXN0PgogIDxyZXNvdXJjZVR5cGUgcmVzb3VyY2VUeXBlR2VuZXJhbD0iRGF0YXNldCIvPgo8L3Jlc291cmNlPgo=",
+            "updated": "2016-12-17T10:00:10Z",
+            "doi": "10.14469/HPC/1985",
+            "relatedIdentifier": ["HasMetadata:URL:https://data.hpc.imperial.ac.uk/resolve/?ore=1985", "HasPart:URL:https://data.hpc.imperial.ac.uk/resolve/?doi=1985&file=1", "HasPart:URL:https://data.hpc.imperial.ac.uk/resolve/?doi=1985&file=2", "HasPart:URL:https://data.hpc.imperial.ac.uk/resolve/?doi=1985&file=3", "IsReferencedBy:DOI:10.14469/hpc/1986", "IsPartOf:DOI:10.14469/hpc/177"],
+            "creator": ["Henry Rzepa"],
+            "publisher": "Imperial College London",
+            "title": ["CrN123: QTAIM analysis"],
+            "nameIdentifier": ["ORCID:0000-0002-8635-8390"],
+            "publicationYear": "2016",
+            "resourceTypeGeneral": "Dataset"
+        }]
+    }
+}

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

@@ -0,0 +1,134 @@
+---
+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:%5B2013-01-01T00:00:00Z%20TO%202016-12-31T23:59:59Z%5D%20AND%20has_metadata:true%20AND%20is_active:true&q=doi:10.6084/M9.FIGSHARE.4126869.V1&rows=0&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:
+      - Sat, 04 Feb 2017 07:15:42 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":1,"start":0,"docs":[]}}
+
+'
+    http_version: 
+  recorded_at: Sat, 04 Feb 2017 07:15:42 GMT
+- 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:%5B2013-01-01T00:00:00Z%20TO%202016-12-31T23:59:59Z%5D%20AND%20has_metadata:true%20AND%20is_active:true&q=doi:10.6084/M9.FIGSHARE.4126869.V1&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:
+      - Sat, 04 Feb 2017 07:15:42 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":2},"response":{"numFound":1,"start":0,"docs":[{"minted":"2016-10-28T21:43:49Z","datacentre_symbol":"FIGSHARE.ARS","xml":"PHJlc291cmNlIHhtbG5zPSJodHRwOi8vZGF0YWNpdGUub3JnL3NjaGVtYS9rZXJuZWwtMyIgeG1sbnM6eHNpPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxL1hNTFNjaGVtYS1pbnN0YW5jZSIgeHNpOnNjaGVtYUxvY2F0aW9uPSJodHRwOi8vZGF0YWNpdGUub3JnL3NjaGVtYS9rZXJuZWwtMyBodHRwOi8vc2NoZW1hLmRhdGFjaXRlLm9yZy9tZXRhL2tlcm5lbC0zL21ldGFkYXRhLnhzZCI+PGlkZW50aWZpZXIgaWRlbnRpZmllclR5cGU9IkRPSSI+MTAuNjA4NC9tOS5maWdzaGFyZS40MTI2ODY5LnYxPC9pZGVudGlmaWVyPjxjcmVhdG9ycz48Y3JlYXRvcj48Y3JlYXRvck5hbWU+U2hpcmxleSBaaGFvPC9jcmVhdG9yTmFtZT48bmFtZUlkZW50aWZpZXIgbmFtZUlkZW50aWZpZXJTY2hlbWU9Ik9SQ0lEIiBzY2hlbWVVUkk9Imh0dHA6Ly9vcmNpZC5vcmciPjAwMDAtMDAwMy0xMDEzLTE1MzM8L25hbWVJZGVudGlmaWVyPjwvY3JlYXRvcj48L2NyZWF0b3JzPjx0aXRsZXM+PHRpdGxlPkluZm9ybWF0aW9uIEVsZXZhdGVkJTNBIEpvaW4gdGhlIFV0YWggU29jaWV0eSBvZiBIZWFsdGggU2NpZW5jZXMgTGlicmFyaWFuczwvdGl0bGU+PC90aXRsZXM+PGRlc2NyaXB0aW9ucz48ZGVzY3JpcHRpb24gZGVzY3JpcHRpb25UeXBlPSJBYnN0cmFjdCI+VGhlIFV0YWggU29jaWV0eSBvZiBIZWFsdGggU2NpZW5jZXMgTGlicmFyaWFucyAoVVNIU0wpIHN1cHBvcnRzIGxpYnJhcnkgcHJvZmVzc2lvbmFscyBpbiBVdGFoIHdobyBoYXZlIGFuIGludGVyZXN0IGluIGltcHJvdmluZyB0aGVpciBza2lsbHMgYXMgaGVhbHRoIGluZm9ybWF0aW9uIHByb3ZpZGVycy4gJmx0O2JyJmd0OzwvZGVzY3JpcHRpb24+PC9kZXNjcmlwdGlvbnM+PHN1YmplY3RzPjxzdWJqZWN0PkxpYnJhcnkgYW5kIEluZm9ybWF0aW9uIFN0dWRpZXM8L3N1YmplY3Q+PHN1YmplY3Qgc2NoZW1lVVJJPSJodHRwOi8vd3d3LmFicy5nb3YuYXUvYXVzc3RhdHMvYWJzQC5uc2YvMC82QkI0MjdBQjk2OTZDMjI1Q0EyNTc0MTgwMDA0NDYzRSIgc3ViamVjdFNjaGVtZT0iRk9SIj4xMTk5OTkgTWVkaWNhbCBhbmQgSGVhbHRoIFNjaWVuY2VzIG5vdCBlbHNld2hlcmUgY2xhc3NpZmllZDwvc3ViamVjdD48L3N1YmplY3RzPjxwdWJsaXNoZXI+Rmlnc2hhcmU8L3B1Ymxpc2hlcj48cHVibGljYXRpb25ZZWFyPjIwMTY8L3B1YmxpY2F0aW9uWWVhcj48ZGF0ZXM+PGRhdGUgZGF0ZVR5cGU9IkNyZWF0ZWQiPjIwMTYtMTAtMjg8L2RhdGU+PGRhdGUgZGF0ZVR5cGU9IlVwZGF0ZWQiPjIwMTYtMTAtMjg8L2RhdGU+PC9kYXRlcz48cmVzb3VyY2VUeXBlIHJlc291cmNlVHlwZUdlbmVyYWw9IkltYWdlIj5Qb3N0ZXI8L3Jlc291cmNlVHlwZT48c2l6ZXM+PHNpemU+NTM1MzI5IEJ5dGVzPC9zaXplPjwvc2l6ZXM+PHJlbGF0ZWRJZGVudGlmaWVycz48cmVsYXRlZElkZW50aWZpZXIgcmVsYXRlZElkZW50aWZpZXJUeXBlPSJET0kiIHJlbGF0aW9uVHlwZT0iSXNJZGVudGljYWxUbyI+MTAuNjA4NC9tOS5maWdzaGFyZS40MTI2ODY5PC9yZWxhdGVkSWRlbnRpZmllcj48L3JlbGF0ZWRJZGVudGlmaWVycz48cmlnaHRzTGlzdD48cmlnaHRzIHJpZ2h0c1VSST0iaHR0cHM6Ly9jcmVhdGl2ZWNvbW1vbnMub3JnL2xpY2Vuc2VzL2J5LzQuMC8iPkNDLUJZPC9yaWdodHM+PC9yaWdodHNMaXN0PjwvcmVzb3VyY2U+","updated":"2016-10-28T21:44:42Z","doi":"10.6084/M9.FIGSHARE.4126869.V1","publisher":"Figshare","creator":["Shirley
+        Zhao"],"title":["Information Elevated%3A Join the Utah Society of Health Sciences
+        Librarians"],"resourceTypeGeneral":"Image","relatedIdentifier":["IsIdenticalTo:DOI:10.6084/m9.figshare.4126869"],"nameIdentifier":["ORCID:0000-0003-1013-1533"],"publicationYear":"2016"}]}}
+
+'
+    http_version: 
+  recorded_at: Sat, 04 Feb 2017 07:15:42 GMT
+- request:
+    method: post
+    uri: https://profiles.test.datacite.org/api/claims
+    body:
+      encoding: UTF-8
+      string: '{"claim":{"orcid":"0000-0003-1013-1533","doi":"10.6084/M9.FIGSHARE.4126869.V1","source_id":"orcid_update","claim_action":"delete"}}'
+    headers:
+      User-Agent:
+      - Maremma - https://github.com/datacite/maremma
+      Content-Type:
+      - application/json
+      Accept:
+      - text/html,application/json,application/xml;q=0.9, text/plain;q=0.8,image/png,*/*;q=0.5
+      Authorization:
+      - Token token=<VOLPINO_TOKEN>
+  response:
+    status:
+      code: 202
+      message: ''
+    headers:
+      Server:
+      - openresty/1.11.2.1
+      Date:
+      - Sat, 04 Feb 2017 07:15:42 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Connection:
+      - keep-alive
+      Status:
+      - 202 Accepted
+      Cache-Control:
+      - no-cache
+      Access-Control-Allow-Origin:
+      - "*"
+      Vary:
+      - Accept-Encoding
+      Access-Control-Max-Age:
+      - '1728000'
+      X-Xss-Protection:
+      - 1; mode=block
+      X-Request-Id:
+      - f2c75afc-f780-48cf-a92b-5663fd8b3e68
+      Access-Control-Allow-Headers:
+      - Origin, Content-Type, Accept, Authorization, Token
+      Access-Control-Allow-Methods:
+      - GET, POST, OPTIONS
+      X-Runtime:
+      - '0.084516'
+      X-Frame-Options:
+      - SAMEORIGIN
+      X-Content-Type-Options:
+      - nosniff
+      X-Powered-By:
+      - Phusion Passenger 5.1.2
+    body:
+      encoding: UTF-8
+      string: '{"data":{"id":"df624600-24c0-4d97-a85e-ca8fe165fe40","type":"claims","attributes":{"orcid":"0000-0003-1013-1533","doi":"10.6084/M9.FIGSHARE.4126869.V1","source-id":"orcid_update","state":"waiting","claim-action":"delete","claimed-at":null}}}'
+    http_version: 
+  recorded_at: Sat, 04 Feb 2017 07:15:42 GMT
+recorded_with: VCR 3.0.3

data/spec/fixtures/vcr_cassettes/Toccatore_OrcidUpdate/push_data/should_delete_claims.yml

@@ -0,0 +1,62 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://profiles.test.datacite.org/api/claims
+    body:
+      encoding: UTF-8
+      string: '{"claim":{"orcid":"0000-0003-1013-1533","doi":"10.6084/M9.FIGSHARE.4126869.V1","source_id":"orcid_update","claim_action":"delete"}}'
+    headers:
+      User-Agent:
+      - Maremma - https://github.com/datacite/maremma
+      Content-Type:
+      - application/json
+      Accept:
+      - text/html,application/json,application/xml;q=0.9, text/plain;q=0.8,image/png,*/*;q=0.5
+      Authorization:
+      - Token token=<VOLPINO_TOKEN>
+  response:
+    status:
+      code: 202
+      message: ''
+    headers:
+      Server:
+      - openresty/1.11.2.1
+      Date:
+      - Sat, 04 Feb 2017 07:26:47 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Connection:
+      - keep-alive
+      Status:
+      - 202 Accepted
+      Cache-Control:
+      - no-cache
+      Access-Control-Allow-Origin:
+      - "*"
+      Vary:
+      - Accept-Encoding
+      Access-Control-Max-Age:
+      - '1728000'
+      X-Xss-Protection:
+      - 1; mode=block
+      X-Request-Id:
+      - 1f76ff9a-5012-467d-b187-dc044107faaa
+      Access-Control-Allow-Headers:
+      - Origin, Content-Type, Accept, Authorization, Token
+      Access-Control-Allow-Methods:
+      - GET, POST, OPTIONS
+      X-Runtime:
+      - '0.008897'
+      X-Frame-Options:
+      - SAMEORIGIN
+      X-Content-Type-Options:
+      - nosniff
+      X-Powered-By:
+      - Phusion Passenger 5.1.2
+    body:
+      encoding: UTF-8
+      string: '{"data":{"id":"df624600-24c0-4d97-a85e-ca8fe165fe40","type":"claims","attributes":{"orcid":"0000-0003-1013-1533","doi":"10.6084/M9.FIGSHARE.4126869.V1","source-id":"orcid_update","state":"failed","claim-action":"delete","claimed-at":null}}}'
+    http_version: 
+  recorded_at: Tue, 07 Apr 2015 22:00:00 GMT
+recorded_with: VCR 3.0.3

data/spec/orcid_update_spec.rb

@@ -63,14 +63,14 @@ describe Toccatore::OrcidUpdate, vcr: true do
     end
 
     it "should allow queries by ORCID ID of the Datacite Metadata Search API" do
-      response = subject.get_data({ query: "nameIdentifier:ORCID\\:0000-0002-3546-1048", from_date: "2013-01-01", until_date: "2016-12-31", rows: 1000, offset: 0 })
+      response = subject.get_data({ orcid: "0000-0002-3546-1048", from_date: "2013-01-01", until_date: "2016-12-31", rows: 1000, offset: 0 })
       expect(response.body["data"]["response"]["numFound"]).to eq(68)
       doc = response.body["data"]["response"]["docs"].first
       expect(doc["doi"]).to eq("10.6084/M9.FIGSHARE.1371005.V1")
     end
 
     it "should allow queries by DOI of the Datacite Metadata Search API" do
-      response = subject.get_data({ query: "doi:10.5438/6423", from_date: "2013-01-01", until_date: "2016-12-31", rows: 1000, offset: 0 })
+      response = subject.get_data({ doi: "10.5438/6423", from_date: "2013-01-01", until_date: "2016-12-31", rows: 1000, offset: 0 })
       expect(response.body["data"]["response"]["numFound"]).to eq(1)
       doc = response.body["data"]["response"]["docs"].first
       name_identifiers = doc["nameIdentifier"]
@@ -105,6 +105,24 @@ describe Toccatore::OrcidUpdate, vcr: true do
                                    "claim_action" => "create")
     end
 
+    it "should report if there are works ignored because of an IsIdenticalTo relation" do
+      body = File.read(fixture_path + 'orcid_update_is_identical.json')
+      result = OpenStruct.new(body: { "data" => JSON.parse(body) })
+      expect(subject.parse_data(result)).to eq([])
+    end
+
+    it "should report if there are works ignored because of an IsPartOf relation" do
+      body = File.read(fixture_path + 'orcid_update_is_part.json')
+      result = OpenStruct.new(body: { "data" => JSON.parse(body) })
+      expect(subject.parse_data(result)).to eq([])
+    end
+
+    it "should report if there are works because of an IsIdenticalTo relation and delete action" do
+      body = File.read(fixture_path + 'orcid_update_is_identical.json')
+      result = OpenStruct.new(body: { "data" => JSON.parse(body) })
+      expect(subject.parse_data(result, claim_action: "delete")).to eq([{"orcid"=>"0000-0003-1013-1533", "doi"=>"10.6084/M9.FIGSHARE.4126869.V1", "source_id"=>"orcid_update", "claim_action"=>"delete"}])
+    end
+
     it "should catch timeout errors with the Datacite Metadata Search API" do
       result = OpenStruct.new(body: { "errors" => [{ "title" => "the server responded with status 408 for https://search.datacite.org", "status" => 408 }] })
       response = subject.parse_data(result)
@@ -123,7 +141,21 @@ describe Toccatore::OrcidUpdate, vcr: true do
       result = OpenStruct.new(body: { "data" => JSON.parse(body) })
       result = subject.parse_data(result)
       options = { push_url: ENV['VOLPINO_URL'], access_token: ENV['VOLPINO_TOKEN'] }
-      expect { subject.push_data(result, options) }.to output(/DOI 10.6084\/M9.FIGSHARE.1041547 for ORCID ID 0000-0002-3546-1048 pushed to Profiles service.\n/).to_stdout
+      expect { subject.push_data(result, options) }.to output(/Create DOI 10.6084\/M9.FIGSHARE.1041547 for ORCID ID 0000-0002-3546-1048 pushed to Profiles service.\n/).to_stdout
+    end
+
+    it "should delete claims" do
+      body = File.read(fixture_path + 'orcid_update_is_identical.json')
+      result = OpenStruct.new(body: { "data" => JSON.parse(body) })
+      result = subject.parse_data(result, claim_action: "delete")
+      options = { push_url: ENV['VOLPINO_URL'], access_token: ENV['VOLPINO_TOKEN'], from_date: "2013-01-01", until_date: "2016-12-31", claim_action: "delete" }
+      expect { subject.push_data(result, options) }.to output(/Delete DOI 10.6084\/M9.FIGSHARE.4126869.V1 for ORCID ID 0000-0003-1013-1533 pushed to Profiles service.\n/).to_stdout
+    end
+  end
+
+  context "unfreeze" do
+    it "should unfreeze" do
+      expect(subject.unfreeze(query_options)).to eq(:from_date=>"2015-04-07", :until_date=>"2015-04-08", :rows=>1000, :offset=>0)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toccatore
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: 0.2.2
 platform: ruby
 authors:
 - Martin Fenner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-02 00:00:00.000000000 Z
+date: 2017-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: maremma
@@ -260,7 +260,10 @@ files:
 - lib/toccatore/version.rb
 - spec/cli_spec.rb
 - spec/fixtures/orcid_update.json
+- spec/fixtures/orcid_update_is_identical.json
+- spec/fixtures/orcid_update_is_part.json
 - spec/fixtures/orcid_update_nil.json
+- spec/fixtures/vcr_cassettes/Toccatore_CLI/orcid_update/should_delete.yml
 - spec/fixtures/vcr_cassettes/Toccatore_CLI/orcid_update/should_fail.yml
 - spec/fixtures/vcr_cassettes/Toccatore_CLI/orcid_update/should_query_by_DOI.yml
 - spec/fixtures/vcr_cassettes/Toccatore_CLI/orcid_update/should_query_by_ORCID_ID.yml
@@ -273,6 +276,7 @@ files:
 - 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_delete_claims.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