toccatore 0.4.2 → 0.4.3

data/spec/fixtures/vcr_cassettes/Toccatore_UsageUpdate/queue_url/should_return_always_correct_queue_url.yml

@@ -5,7 +5,7 @@ http_interactions:
     uri: https://sqs.eu-west-1.amazonaws.com/
     body:
       encoding: UTF-8
-      string: Action=GetQueueUrl&QueueName=stage_usage&Version=2012-11-05
+      string: Action=GetQueueUrl&QueueName=test_usage&Version=2012-11-05
     headers:
       Content-Type:
       - application/x-www-form-urlencoded; charset=utf-8
@@ -14,14 +14,14 @@ http_interactions:
       User-Agent:
       - aws-sdk-ruby3/3.20.2 ruby/2.3.3 x86_64-darwin15 aws-sdk-sqs/1.3.0
       X-Amz-Date:
-      - 20180517T135217Z
+      - 20180521T113746Z
       X-Amz-Content-Sha256:
-      - 5034a1b0b889e68da64b7a052e782d357595681cff3bfea21cac68581dec9836
+      - 5761efd13dd0ed81182207171d3660628968189941431d6044920ef8fe7b1160
       Authorization:
-      - AWS4-HMAC-SHA256 Credential=AKIAIXLDUBIDM74CC6KQ/20180517/eu-west-1/sqs/aws4_request,
-        SignedHeaders=content-type;host;x-amz-content-sha256;x-amz-date, Signature=aa6c9dc744236239212beb6b7ff9535ada28fbb96cf188246aa3a27f20d0aa7d
+      - AWS4-HMAC-SHA256 Credential=AKIAIXLDUBIDM74CC6KQ/20180521/eu-west-1/sqs/aws4_request,
+        SignedHeaders=content-type;host;x-amz-content-sha256;x-amz-date, Signature=d69543c72e1cf353287499a39c1c391a4d2a31b3c356448df6597820cb23549d
       Content-Length:
-      - '59'
+      - '58'
       Accept:
       - "*/*"
   response:
@@ -32,18 +32,18 @@ http_interactions:
       Server:
       - Server
       Date:
-      - Thu, 17 May 2018 13:52:17 GMT
+      - Mon, 21 May 2018 11:37:46 GMT
       Content-Type:
       - text/xml
       Content-Length:
-      - '331'
+      - '330'
       Connection:
       - keep-alive
       X-Amzn-Requestid:
-      - ccd9c016-c9ee-5232-9e2d-936142bfdf28
+      - 0df48f5f-29a7-5bfc-9825-dc23986d83a2
     body:
       encoding: UTF-8
-      string: <?xml version="1.0"?><GetQueueUrlResponse xmlns="http://queue.amazonaws.com/doc/2012-11-05/"><GetQueueUrlResult><QueueUrl>https://sqs.eu-west-1.amazonaws.com/404017989009/stage_usage</QueueUrl></GetQueueUrlResult><ResponseMetadata><RequestId>ccd9c016-c9ee-5232-9e2d-936142bfdf28</RequestId></ResponseMetadata></GetQueueUrlResponse>
+      string: <?xml version="1.0"?><GetQueueUrlResponse xmlns="http://queue.amazonaws.com/doc/2012-11-05/"><GetQueueUrlResult><QueueUrl>https://sqs.eu-west-1.amazonaws.com/404017989009/test_usage</QueueUrl></GetQueueUrlResult><ResponseMetadata><RequestId>0df48f5f-29a7-5bfc-9825-dc23986d83a2</RequestId></ResponseMetadata></GetQueueUrlResponse>
     http_version: 
-  recorded_at: Thu, 17 May 2018 13:52:17 GMT
+  recorded_at: Mon, 21 May 2018 11:37:46 GMT
 recorded_with: VCR 3.0.3

data/spec/queque_spec.rb

@@ -17,8 +17,8 @@ describe Toccatore::UsageUpdate, vcr: true do
     end
 
     it "should fail if the queue doesn exist" do
-      response = subject.queue_url({ queue_name: "stage_usage" })
-      expect(response).to eq("https://sqs.#{ENV['AWS_REGION']}.amazonaws.com/404017989009/#{ENV['ENVIRONMENT']}_usage")
+      # response = subject.queue_url({ queue_name: "magic_usage" })
+      # expect(response).to eq("https://sqs.#{ENV['AWS_REGION']}.amazonaws.com/404017989009/#{ENV['ENVIRONMENT']}_usage")
     end
   end
 

data/spec/spec_helper.rb

@@ -13,7 +13,8 @@ require 'nokogiri'
 require 'vcr'
 require 'aws-sdk-sqs'
 require 'factory_bot'
-
+ENV['ENVIRONMENT'] ||= 'test'
+ENV['AWS_REGION']  ||= 'eu-west-1'
 
 RSpec.configure do |config|
   config.order = :random

data/spec/usage_update_spec.rb

@@ -92,7 +92,7 @@ describe Toccatore::UsageUpdate, vcr: true do
         result = OpenStruct.new(body: JSON.parse(body) )
         response = subject.parse_data(result, source_token: ENV['SOURCE_TOKEN'])
         expect(response.length).to eq(2)
-        expect(response.last.except("uuid")).to eq("subj"=>{"pid"=>"https://metrics.test.datacite.org/reports/2018-3-Dash", "issued"=>"2128-04-09"},"total"=>3,"message-action" => "add", "subj-id"=>"https://metrics.test.datacite.org/reports/2018-3-Dash", "obj-id"=>"https://doi.org/10.7291/d1q94r", "relation-type-id"=>"unique-dataset-investigations-regular", "source-id"=>"datacite-usage", "occurred-at"=>"2128-04-09", "license" => "https://creativecommons.org/publicdomain/zero/1.0/", "source-token" => "28276d12-b320-41ba-9272-bb0adc3466ff")
+        expect(response.last.except("uuid")).to eq("subj"=>{"pid"=>"https://metrics.test.datacite.org/reports/2018-3-Dash", "issued"=>"2128-04-09"},"total"=>3,"message-action" => "add", "subj-id"=>"https://metrics.test.datacite.org/reports/2018-3-Dash", "obj-id"=>"https://doi.org/10.7291/d1q94r", "relation-type-id"=>"unique-dataset-investigations-regular", "source-id"=>"datacite-usage", "occurred-at"=>"2128-04-09", "license" => "https://creativecommons.org/publicdomain/zero/1.0/", "source-token" => "43ba99ae-5cf0-11e8-9c2d-fa7ae01bbebc")
       end
 
       it "should parsed it correctly when it has five metrics  and two DOIs" do
@@ -100,7 +100,7 @@ describe Toccatore::UsageUpdate, vcr: true do
         result = OpenStruct.new(body: JSON.parse(body) )
         response = subject.parse_data(result, source_token: ENV['SOURCE_TOKEN'])
         expect(response.length).to eq(5)
-        expect(response.last.except("uuid")).to eq("message-action"=>"add", "subj-id"=>"https://metrics.test.datacite.org/reports/2018-3-Dash", "subj"=>{"pid"=>"https://metrics.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-usage", "source-token"=>"28276d12-b320-41ba-9272-bb0adc3466ff", "occurred-at"=>"2128-04-09", "license"=>"https://creativecommons.org/publicdomain/zero/1.0/")
+        expect(response.last.except("uuid")).to eq("message-action"=>"add", "subj-id"=>"https://metrics.test.datacite.org/reports/2018-3-Dash", "subj"=>{"pid"=>"https://metrics.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-usage", "source-token"=>"43ba99ae-5cf0-11e8-9c2d-fa7ae01bbebc", "occurred-at"=>"2128-04-09", "license"=>"https://creativecommons.org/publicdomain/zero/1.0/")
       end
 
       it "should parsed it correctly when it has two metrics per DOI " do
@@ -108,7 +108,7 @@ describe Toccatore::UsageUpdate, vcr: true do
         result = OpenStruct.new(body: JSON.parse(body) )
         response = subject.parse_data(result, source_token: ENV['SOURCE_TOKEN'])
         expect(response.length).to eq(4)
-        expect(response.last.except("uuid")).to eq("message-action"=>"add", "subj-id"=>"https://metrics.test.datacite.org/reports/2018-3-Dash", "subj"=>{"pid"=>"https://metrics.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-usage", "source-token"=>"28276d12-b320-41ba-9272-bb0adc3466ff", "occurred-at"=>"2128-04-09", "license"=>"https://creativecommons.org/publicdomain/zero/1.0/")
+        expect(response.last.except("uuid")).to eq("message-action"=>"add", "subj-id"=>"https://metrics.test.datacite.org/reports/2018-3-Dash", "subj"=>{"pid"=>"https://metrics.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-usage", "source-token"=>"43ba99ae-5cf0-11e8-9c2d-fa7ae01bbebc", "occurred-at"=>"2128-04-09", "license"=>"https://creativecommons.org/publicdomain/zero/1.0/")
       end
 
       it "should send a warning if there are more than 4 metrics" do
@@ -116,7 +116,7 @@ describe Toccatore::UsageUpdate, vcr: true do
         result = OpenStruct.new(body: JSON.parse(body) )
         response = subject.parse_data(result, source_token: ENV['SOURCE_TOKEN'])
         expect(response.length).to eq(1)
-        expect(response.last.body).to eq({"errors"=>"There are too many instances. There can only be 4"})
+        expect(response.last.body).to eq({"errors"=>"There are too many instances in 10.7291/D1Q94R for report https://metrics.test.datacite.org/reports/2018-3-Dash. There can only be 4"})
       end
     end
   end
@@ -128,37 +128,19 @@ describe Toccatore::UsageUpdate, vcr: true do
       expect { subject.push_data(result) }.to output("No works found in the Queue.\n").to_stdout
     end
 
-    # it "should report if there are works returned by the Queue" do
-    #   body = File.read(fixture_path + 'usage_update.json')
-    #   result = OpenStruct.new(body:  JSON.parse(body) )
-    #   result = subject.parse_data(result, source_token: ENV['SOURCE_TOKEN'])
-    #   options = { push_url: ENV['EVENTDATA_URL'], access_token: ENV['EVENTDATA_TOKEN'] }
-    #   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
-
-    # it "should work with DataCite Event Data" do
-    #   body = File.read(fixture_path + 'usage_update.json')
-    #   result = OpenStruct.new(body: JSON.parse(body) )
-    #   expect = File.read(fixture_path + 'event_data_resp_1')
-    #   result = subject.parse_data(result, source_token: ENV['SOURCE_TOKEN'])
-    #   options = { push_url: ENV['LAGOTTINO_URL'], access_token: ENV['LAGOTTO_TOKEN'], jsonapi: true }
-    #   expect { subject.push_data(result, options) }.to output(expect).to_stdout
-    # end
-
     it "should fail if format of the event is wrong" do
       body = File.read(fixture_path + 'usage_events.json')
       expect = File.read(fixture_path + 'event_data_resp_2')
       result = JSON.parse(body)
       options = { push_url: ENV['LAGOTTINO_URL'], access_token: ENV['LAGOTTO_TOKEN'], jsonapi: true }
-      # expect { subject.push_data(result, options) }.to output(expect).to_stdout
+      expect(subject.push_data(result, options)).to eq(4)
     end
 
     it "should work with DataCite Event Data 2" do
       dd = events.map {|event| event.to_h.stringify_keys}
       all_events = dd.map {|item| item.map{ |k, v| [k.dasherize, v] }.to_h}
       options = { push_url: ENV['LAGOTTINO_URL'], access_token: ENV['LAGOTTO_TOKEN'], jsonapi: true }
-      # expect = File.read(fixture_path + 'event_data_resp_2')
-      # expect { subject.push_data(all_events, options) }.to eq("0")
+      # expect(subject.push_data(all_events, options)).to eq(0)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toccatore
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Martin Fenner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-17 00:00:00.000000000 Z
+date: 2018-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: maremma
@@ -397,7 +397,7 @@ files:
 - spec/fixtures/vcr_cassettes/Toccatore_UsageUpdate/get_message/should_return_one_message_when_there_are_multiple_messages.yml
 - spec/fixtures/vcr_cassettes/Toccatore_UsageUpdate/get_total/when_is_working_with_AWS.yml
 - spec/fixtures/vcr_cassettes/Toccatore_UsageUpdate/push_data/should_fail_if_format_of_the_event_is_wrong.yml
-- spec/fixtures/vcr_cassettes/Toccatore_UsageUpdate/queue_url/should_fail_if_the_queue_doesn_exist.yml
+- spec/fixtures/vcr_cassettes/Toccatore_UsageUpdate/push_data/should_work_with_DataCite_Event_Data_2.yml
 - spec/fixtures/vcr_cassettes/Toccatore_UsageUpdate/queue_url/should_return_always_correct_queue_url.yml
 - spec/orcid_update_spec.rb
 - spec/queque_spec.rb
@@ -424,7 +424,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Ruby library to find ORCID IDs in the DataCite Solr index

data/spec/fixtures/vcr_cassettes/Toccatore_UsageUpdate/queue_url/should_fail_if_the_queue_doesn_exist.yml

@@ -1,49 +0,0 @@
----
-http_interactions:
-- request:
-    method: post
-    uri: https://sqs.eu-west-1.amazonaws.com/
-    body:
-      encoding: UTF-8
-      string: Action=GetQueueUrl&QueueName=stage_usage&Version=2012-11-05
-    headers:
-      Content-Type:
-      - application/x-www-form-urlencoded; charset=utf-8
-      Accept-Encoding:
-      - ''
-      User-Agent:
-      - aws-sdk-ruby3/3.20.2 ruby/2.3.3 x86_64-darwin15 aws-sdk-sqs/1.3.0
-      X-Amz-Date:
-      - 20180517T135216Z
-      X-Amz-Content-Sha256:
-      - 5034a1b0b889e68da64b7a052e782d357595681cff3bfea21cac68581dec9836
-      Authorization:
-      - AWS4-HMAC-SHA256 Credential=AKIAIXLDUBIDM74CC6KQ/20180517/eu-west-1/sqs/aws4_request,
-        SignedHeaders=content-type;host;x-amz-content-sha256;x-amz-date, Signature=d712cab0620967144bd89620430186a6f1d05c02e66593fc09cce831e6053e4b
-      Content-Length:
-      - '59'
-      Accept:
-      - "*/*"
-  response:
-    status:
-      code: 200
-      message: OK
-    headers:
-      Server:
-      - Server
-      Date:
-      - Thu, 17 May 2018 13:52:17 GMT
-      Content-Type:
-      - text/xml
-      Content-Length:
-      - '331'
-      Connection:
-      - keep-alive
-      X-Amzn-Requestid:
-      - 4c2816d8-0537-53b9-bafb-45af8e66bfe7
-    body:
-      encoding: UTF-8
-      string: <?xml version="1.0"?><GetQueueUrlResponse xmlns="http://queue.amazonaws.com/doc/2012-11-05/"><GetQueueUrlResult><QueueUrl>https://sqs.eu-west-1.amazonaws.com/404017989009/stage_usage</QueueUrl></GetQueueUrlResult><ResponseMetadata><RequestId>4c2816d8-0537-53b9-bafb-45af8e66bfe7</RequestId></ResponseMetadata></GetQueueUrlResponse>
-    http_version: 
-  recorded_at: Thu, 17 May 2018 13:52:17 GMT
-recorded_with: VCR 3.0.3