toccatore 0.4.9 → 0.4.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d2393ac345f665ff869026daac1b7b682a9e030a7d789282a0bdd2948e03f16
-  data.tar.gz: 7430af2a9767e27c9db91e16146f02c0f63c2f756610ebfd3b07497851c00f01
+  metadata.gz: c2bca606b9f51fbc4d7f901f90abcec47976afae2c248469411b0ef5313a919b
+  data.tar.gz: 43c7babcf034873703bbb44d385129d5b464d4f6f7e06b75f0c91b19bad9e302
 SHA512:
-  metadata.gz: df1fc16c9eae4ef0559d8ce8fc182642eb685204e979da0888b0283d164f820f81b3acdbf2c98f8ae4cd370788cb1a62f0f8687d06b2908dc4f7fef4f3a5f307
-  data.tar.gz: 48b01f06f65370caeae8610041c16df4111af98b1cafc748f901d71053168f4d036f7c3757d48d2a276a2c804586a8d0346bdce87d6b19299a903a75ee79f7b6
+  metadata.gz: c0e46e32e4a2ba33941bdfabe8912d2a4cc6ffd60bbf0b77ae69711a3384ef36912f7b77a5c7b190c6b9f0f5ece228b01b04420eaf548fa942c434cd43c534cd
+  data.tar.gz: 9a6b56efb2de5e86bbb7ddeea0009801e0f3f59d052b1151778d8a2d3efd434ed6d76497ca31d1300ca07c69160b81cb3b5956302550f9bcd39a5e04b5d24d4f

data/Gemfile.lock

@@ -1,38 +1,38 @@
 PATH
   remote: .
   specs:
-    toccatore (0.4.9)
-      activesupport (~> 4.2, >= 4.2.5)
+    toccatore (0.4.10)
+      activesupport (>= 4.2.5, < 6)
       aws-sdk-sqs
       dotenv (~> 2.1, >= 2.1.1)
       factory_bot
       gender_detector (~> 1.0)
-      maremma (~> 3.5)
+      maremma (>= 3.5.7, < 5)
       namae (~> 0.11.0)
-      slack-notifier (= 2.2.2)
+      slack-notifier (~> 2.1)
       thor (~> 0.19)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.10)
-      i18n (~> 0.7)
+    activesupport (5.2.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.5.1)
-      public_suffix (~> 2.0, >= 2.0.2)
-    aws-eventstream (1.0.0)
-    aws-partitions (1.87.0)
-    aws-sdk-core (3.21.2)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
+    aws-eventstream (1.0.1)
+    aws-partitions (1.97.0)
+    aws-sdk-core (3.24.0)
       aws-eventstream (~> 1.0)
       aws-partitions (~> 1.0)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-sqs (1.3.0)
+    aws-sdk-sqs (1.4.0)
       aws-sdk-core (~> 3)
       aws-sigv4 (~> 1.0)
-    aws-sigv4 (1.0.2)
+    aws-sigv4 (1.0.3)
     builder (3.2.3)
     codeclimate-test-reporter (1.0.8)
       simplecov (<= 0.13)
@@ -41,32 +41,32 @@ GEM
       safe_yaml (~> 1.0.0)
     diff-lcs (1.3)
     docile (1.1.5)
-    dotenv (2.4.0)
-    excon (0.45.4)
-    factory_bot (4.8.2)
+    dotenv (2.5.0)
+    excon (0.62.0)
+    factory_bot (4.10.0)
       activesupport (>= 3.0.0)
-    faker (1.8.7)
+    faker (1.9.1)
       i18n (>= 0.7)
-    faraday (0.9.2)
+    faraday (0.15.2)
       multipart-post (>= 1.2, < 3)
     faraday-encoding (0.0.4)
       faraday
-    faraday_middleware (0.10.1)
+    faraday_middleware (0.12.2)
       faraday (>= 0.7.4, < 1.0)
     gender_detector (1.0.0)
-    hashdiff (0.3.4)
-    i18n (0.9.5)
+    hashdiff (0.3.7)
+    i18n (1.1.0)
       concurrent-ruby (~> 1.0)
     jmespath (1.4.0)
     json (2.1.0)
-    maremma (3.6.2)
+    maremma (4.1)
       activesupport (>= 4.2.5, < 6)
       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)
+      excon (~> 0.60)
+      faraday (~> 0.14)
+      faraday-encoding (~> 0.0.4)
+      faraday_middleware (~> 0.12.0)
       multi_json (~> 1.12)
       nokogiri (~> 1.8.1)
       oj (>= 2.8.3)
@@ -75,40 +75,40 @@ GEM
     multi_json (1.13.1)
     multipart-post (2.0.0)
     namae (0.11.3)
-    nokogiri (1.8.2)
+    nokogiri (1.8.4)
       mini_portile2 (~> 2.3.0)
-    oj (3.6.0)
-    public_suffix (2.0.5)
-    rack (2.0.3)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rake (12.0.0)
-    rspec (3.6.0)
-      rspec-core (~> 3.6.0)
-      rspec-expectations (~> 3.6.0)
-      rspec-mocks (~> 3.6.0)
-    rspec-core (3.6.0)
-      rspec-support (~> 3.6.0)
-    rspec-expectations (3.6.0)
+    oj (3.6.5)
+    public_suffix (3.0.2)
+    rack (2.0.5)
+    rack-test (0.8.3)
+      rack (>= 1.0, < 3)
+    rake (12.3.1)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-mocks (3.6.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-support (3.6.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
     safe_yaml (1.0.4)
-    simplecov (0.12.0)
+    simplecov (0.13.0)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.1)
-    slack-notifier (2.2.2)
+    simplecov-html (0.10.2)
+    slack-notifier (2.3.2)
     thor (0.20.0)
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
     vcr (3.0.3)
-    webmock (1.24.6)
+    webmock (3.4.2)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
@@ -118,16 +118,16 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.0)
-  codeclimate-test-reporter (~> 1.0, >= 1.0.0)
+  codeclimate-test-reporter (~> 1.0)
   factory_bot
   faker
   rack-test (~> 0)
   rake (~> 12.0)
   rspec (~> 3.4)
-  simplecov (~> 0.12.0)
+  simplecov
   toccatore!
   vcr (~> 3.0, >= 3.0.3)
-  webmock (~> 1.22, >= 1.22.3)
+  webmock (~> 3.0, >= 3.0.1)
 
 BUNDLED WITH
    1.16.1

data/lib/toccatore/base.rb

@@ -145,8 +145,8 @@ module Toccatore
       notifier = Slack::Notifier.new options[:slack_webhook_url],
                                      username: "Event Data Agent",
                                      icon_url: ICON_URL
-      response = notifier.ping attachments: [attachment]
-      response.body
+      response = notifier.post attachments: [attachment]
+      response.first
     end
 
     def get_doi_ra(prefix)

data/lib/toccatore/datacite_related.rb

@@ -67,7 +67,16 @@ module Toccatore
         data = { "data" => {
                    "id" => item["id"],
                    "type" => "events",
-                   "attributes" => item.except("id") }}
+                   "attributes" => {
+                     "message-action" => item["message_action"],
+                     "subj-id" => item["subj_id"],
+                     "obj-id" => item["obj_id"],
+                     "relation-type-id" => item["relation_type_id"],
+                     "source-id" => "datacite-crossref",
+                     "source-token" => item["source_token"],
+                     "occurred-at" => item["occured-at"],
+                     "license" => item["license"] } }}
+
         response = Maremma.post(push_url, data: data.to_json,
                                           bearer: options[:access_token],
                                           content_type: 'json',

data/lib/toccatore/version.rb

@@ -1,3 +1,3 @@
 module Toccatore
-  VERSION = "0.4.9"
+  VERSION = "0.4.10"
 end

data/spec/base_spec.rb

@@ -35,7 +35,7 @@ describe Toccatore::Base, vcr: true do
     it "datacite_related" do
       text =  "12 works processed for date range 2015-04-07 - 2015-04-08."
       options = { title: "Report for datacite_related", slack_webhook_url: slack_webhook_url }
-      expect(subject.send_notification_to_slack(text, options)).to eq("ok")
+      expect(subject.send_notification_to_slack(text, options)).to be_kind_of(Net::HTTPOK)
     end
 
     it "datacite_related no works" do
@@ -43,13 +43,13 @@ describe Toccatore::Base, vcr: true do
       options = { title: "Report for datacite_related",
                   slack_webhook_url: slack_webhook_url,
                   level: "warning" }
-      expect(subject.send_notification_to_slack(text, options)).to eq("ok")
+      expect(subject.send_notification_to_slack(text, options)).to be_kind_of(Net::HTTPOK)
     end
 
     it "orcid_update" do
       text =  "12 works processed for date range 2015-04-07 - 2015-04-08."
       options = { title: "Report for orcid_update", slack_webhook_url: slack_webhook_url }
-      expect(subject.send_notification_to_slack(text, options)).to eq("ok")
+      expect(subject.send_notification_to_slack(text, options)).to be_kind_of(Net::HTTPOK)
     end
 
     it "orcid_update no works" do
@@ -57,7 +57,7 @@ describe Toccatore::Base, vcr: true do
       options = { title: "Report for orcid_update",
                   slack_webhook_url: slack_webhook_url,
                   level: "warning" }
-      expect(subject.send_notification_to_slack(text, options)).to eq("ok")
+      expect(subject.send_notification_to_slack(text, options)).to be_kind_of(Net::HTTPOK)
     end
   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.9\n").to_stdout
+      expect { subject.__print_version }.to output("0.4.10\n").to_stdout
     end
   end
 
@@ -77,7 +77,7 @@ describe Toccatore::CLI do
 
     it 'should succeed' do
       subject.options = cli_options
-      expect { subject.datacite_related }.to output(/https:\/\/doi.org\/10.5281\/zenodo.16396 is_supplement_to https:\/\/doi.org\/10.1007\/s11548-015-1180-7 pushed to Event Data service.\n/).to_stdout
+      expect { subject.datacite_related }.to output(/https:\/\/doi.org\/10.15468\/dl.mb4das references https:\/\/doi.org\/10.3897\/phytokeys.12.2849 pushed to Event Data service.\n/).to_stdout
     end
 
     it 'should query by DOI' do
@@ -86,7 +86,7 @@ describe Toccatore::CLI do
     end
 
     it 'should query by related_identifier' do
-      subject.options = cli_options.merge(related_identifier: "10.7554/elife.01567", from_date: "2013-01-01", until_date: "2017-12-31")
+      subject.options = cli_options.merge(related_identifier: "10.7554/elife.01567", from_date: "2013-01-01", until_date: "2018-12-31")
       expect { subject.datacite_related }.to output(/https:\/\/doi.org\/10.5061\/dryad.b835k is_referenced_by https:\/\/doi.org\/10.7554\/elife.01567 pushed to Event Data service.\n/).to_stdout
     end
 
@@ -107,36 +107,36 @@ describe Toccatore::CLI do
     end
   end
 
-    describe "usage_update", vcr: true, :order => :defined do
-      let(:push_url) { ENV['LAGOTTINO_URL'] }
-      let(:access_token) { ENV['LAGOTTO_TOKEN'] }
-      let(:source_token) { ENV['SOURCE_TOKEN'] }
-      let(:slack_webhook_url) { ENV['SLACK_WEBHOOK_URL'] }
-      let(:cli_options) { { push_url: push_url,
+  describe "usage_update", vcr: true, :order => :defined do
+    let(:push_url) { ENV['LAGOTTINO_URL'] }
+    let(:access_token) { ENV['LAGOTTINO_TOKEN'] }
+    let(:source_token) { ENV['SOURCE_TOKEN'] }
+    let(:slack_webhook_url) { ENV['SLACK_WEBHOOK_URL'] }
+    let(:cli_options) { { push_url: push_url,
+                          slack_webhook_url: slack_webhook_url,
+                          access_token: access_token,
+                          source_token: source_token } }
+
+
+    context "no reports in the queue" do 
+      it 'should succeed with no works' do
+        subject.options = { push_url: push_url,
                             slack_webhook_url: slack_webhook_url,
-                            access_token: access_token,
-                            source_token: source_token } }
-  
-
-      context "no reports in the queue" do 
-        it 'should succeed with no works' do
-          subject.options = { push_url: push_url,
-                              slack_webhook_url: slack_webhook_url,
-                              access_token: access_token}
-          expect { subject.usage_update }.to output("0 works processed with 0 errors for Usage Reports Queue https://sqs.eu-west-1.amazonaws.com/404017989009/test_usage\n").to_stdout
-        end
+                            access_token: access_token}
+        expect { subject.usage_update }.to output("0 works processed with 0 errors for Usage Reports Queue https://sqs.eu-west-1.amazonaws.com/404017989009/test_usage\n").to_stdout
       end
+    end
 
-      context "with reports in the queue" do 
-        # TO test this we need a real queue working 
-        # it 'should succeed' do
-        #   subject.options = cli_options
-        #   expect { subject.usage_update }.to output("0 works processed with 0 errors for Usage Reports Queue https://sqs.eu-west-1.amazonaws.com/404017989009/test_usage\n").to_stdout
-        # end
-        # it 'should fail' do
-        #   subject.options = cli_options.except(:access_token)
-        #   expect { subject.usage_update }.to output(/An error occured: Access token missing.\n/).to_stdout
-        # end
-      end
+    context "with reports in the queue" do 
+      # TO test this we need a real queue working 
+      # it 'should succeed' do
+      #   subject.options = cli_options
+      #   expect { subject.usage_update }.to output("0 works processed with 0 errors for Usage Reports Queue https://sqs.eu-west-1.amazonaws.com/404017989009/test_usage\n").to_stdout
+      # end
+      # it 'should fail' do
+      #   subject.options = cli_options.except(:access_token)
+      #   expect { subject.usage_update }.to output(/An error occured: Access token missing.\n/).to_stdout
+      # end
     end
+  end
 end

data/spec/datacite_related_spec.rb

@@ -29,7 +29,7 @@ describe Toccatore::DataciteRelated, vcr: true do
 
   context "get_total" do
     it "with works" do
-      expect(subject.get_total(query_options)).to eq(650)
+      expect(subject.get_total(query_options)).to eq(640)
     end
 
     it "with no works" do
@@ -57,19 +57,19 @@ describe Toccatore::DataciteRelated, vcr: true do
 
     it "should report if there are works returned by the Datacite Metadata Search API" do
       response = subject.get_data(query_options)
-      expect(response.body["data"]["response"]["numFound"]).to eq(650)
+      expect(response.body["data"]["response"]["numFound"]).to eq(640)
       doc = response.body["data"]["response"]["docs"].first
-      expect(doc["doi"]).to eq("10.7480/KNOB.113.2014.3")
+      expect(doc["doi"]).to eq("10.7480/KNOB.113.2014.3.830")
     end
 
     it "should allow queries by related_identifier of the Datacite Metadata Search API" do
-      response = subject.get_data({ related_identifier: "10.7554/elife.01567", from_date: "2013-01-01", until_date: "2017-12-31", rows: 1000, offset: 0 })
-      expect(response.body["data"]["response"]["numFound"]).to eq(1)
+      response = subject.get_data({ related_identifier: "10.3897/phytokeys.12.2849", from_date: "2013-01-01", until_date: "2017-12-31", rows: 1000, offset: 0 })
+      expect(response.body["data"]["response"]["numFound"]).to eq(14223)
       doc = response.body["data"]["response"]["docs"].first
-      expect(doc["doi"]).to eq("10.5061/DRYAD.B835K")
+      expect(doc["doi"]).to eq("10.15468/DL.MBSMUW")
       related_identifiers = doc["relatedIdentifier"]
-      expect(related_identifiers.count).to eq(6)
-      expect(related_identifiers[4]).to eq("IsReferencedBy:DOI:10.7554/ELIFE.01567")
+      expect(related_identifiers.count).to eq(1)
+      expect(related_identifiers.first).to eq("References:DOI:10.3897/phytokeys.12.2849")
     end
 
     it "should allow queries by DOI of the Datacite Metadata Search API" do
@@ -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" => "43ba99ae-5cf0-11e8-9c2d-fa7ae01bbebc", "occurred_at"=>"2015-04-07T12:22:40Z", "license" => "https://creativecommons.org/publicdomain/zero/1.0/")
+      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" => ENV['SOURCE_TOKEN'], "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
@@ -136,7 +136,7 @@ describe Toccatore::DataciteRelated, vcr: true do
       body = File.read(fixture_path + 'datacite_related.json')
       result = OpenStruct.new(body: { "data" => JSON.parse(body) })
       result = subject.parse_data(result, source_token: ENV['SOURCE_TOKEN'])
-      options = { push_url: ENV['LAGOTTO_URL'], access_token: ENV['LAGOTTO_TOKEN'], jsonapi: true }
+      options = { push_url: ENV['LAGOTTINO_URL'], access_token: ENV['LAGOTTINO_TOKEN'], jsonapi: true }
       expect { subject.push_data(result, options) }.to output(/https:\/\/doi.org\/10.15468\/dl.mb4das references https:\/\/doi.org\/10.3897\/phytokeys.12.2849 pushed to Event Data service.\n/).to_stdout
     end
   end

data/spec/fixtures/event_data_resp_1

@@ -1,2 +1,2 @@
-https://metrics.test.datacite.org/reports/2018-3-Dash total-dataset-investigations-regular https://doi.org/10.7291/d1q94r pushed to Event Data service.
-https://metrics.test.datacite.org/reports/2018-3-Dash unique-dataset-investigations-regular https://doi.org/10.7291/d1q94r pushed to Event Data service.
+https://api.test.datacite.org/reports/2018-3-Dash total-dataset-investigations-regular https://doi.org/10.7291/d1q94r pushed to Event Data service.
+https://api.test.datacite.org/reports/2018-3-Dash unique-dataset-investigations-regular https://doi.org/10.7291/d1q94r pushed to Event Data service.

data/spec/fixtures/event_data_resp_2

@@ -1,4 +1,4 @@
-https://metrics.test.datacite.org/reports/2018-3-Dash total-dataset-investigations-regular https://doi.org/10.7291/d1q94r had an error:\nthe server responded with status 500/\n
-https://metrics.test.datacite.org/reports/2018-3-Dash unique-dataset-investigations-regular https://doi.org/10.7291/d1q94r had an error:\nthe server responded with status 500/\n
-https://metrics.test.datacite.org/reports/2018-3-Dash Total-Dataset-Requests-Machine https://doi.org/10.6071/z7wc73 had an error:\nthe server responded with status 500/\n
-https://metrics.test.datacite.org/reports/2018-3-Dash Unique-Dataset-Requests-Machine https://doi.org/10.6071/z7wc73 had an error:\nthe server responded with status 500/\n
+https://api.test.datacite.org/reports/2018-3-Dash total-dataset-investigations-regular https://doi.org/10.7291/d1q94r had an error:\nthe server responded with status 500/\n
+https://api.test.datacite.org/reports/2018-3-Dash unique-dataset-investigations-regular https://doi.org/10.7291/d1q94r had an error:\nthe server responded with status 500/\n
+https://api.test.datacite.org/reports/2018-3-Dash Total-Dataset-Requests-Machine https://doi.org/10.6071/z7wc73 had an error:\nthe server responded with status 500/\n
+https://api.test.datacite.org/reports/2018-3-Dash Unique-Dataset-Requests-Machine https://doi.org/10.6071/z7wc73 had an error:\nthe server responded with status 500/\n

data/spec/fixtures/events_empty.json

@@ -17,16 +17,16 @@
   }, {
     "uuid": "fc6860b8-4230-41bc-8b8e-21d60e9a7d9a",
     "message-action": "add",
-    "subj-id": "https://metrics.test.datacite.org/reports/2018-3-Dashs",
+    "subj-id": "https://api.test.datacite.org/reports/2018-3-Dashs",
     "subj": {
-      "pid": "https://metrics.test.datacite.org/reports/2018-3-Dashs",
+      "pid": "https://api.test.datacite.org/reports/2018-3-Dashs",
       "issued": "2128-04-09"
     },
     "total": 3,
     "obj-id": "https://doi.org/10.7291/d1q94r",
     "relation-type-id": "unique-dataset-investigations-regular",
     "source-id": "datacite",
-    "source-token": "43ba99ae-5cf0-11e8-9c2d-fa7ae01bbebc",
+    "source-token": "28276d12-b320-41ba-9272-bb0adc3466ff",
     "occurred-at": "2128-04-09",
     "license": "https://creativecommons.org/publicdomain/zero/1.0/"
   }

data/spec/fixtures/usage_event.json

@@ -1 +1 @@
-{"report_id":"https://metrics.test.datacite.org/reports/5cac6ca0-9391-4e1d-95cf-ba2f475cbfad"}
+{"report_id":"https://api.test.datacite.org/reports/5cac6ca0-9391-4e1d-95cf-ba2f475cbfad"}

data/spec/fixtures/usage_event_fail.json

@@ -2,14 +2,14 @@
     "id": 12332423432432,
     "message-action": "add",
     "subj": {
-      "pid": "https://metrics.test.datacite.org/reports/2018-3-Dash",
+      "pid": "https://api.test.datacite.org/reports/2018-3-Dash",
       "issued": "2128-04-09"
     },
     "total": "208",
     "obj-id": "https://doi.org/10.6071/z7wc73",
     "relation-type-id": "Unique-Dataset-Requests-Machine",
     "source-id": "datacite",
-    "source-token": "43ba99ae-5cf0-11e8-9c2d-fa7ae01bbebc",
+    "source-token": "28276d12-b320-41ba-9272-bb0adc3466ff",
     "occurred-at": "2128-04-09",
     "license": "https://creativecommons.org/publicdomain/zero/1.0/"
   }