toccatore 0.4.6 → 0.4.7

data/spec/fixtures/vcr_cassettes/Toccatore_UsageUpdate/push_data/should_work_with_a_single_item.yml

@@ -21,7 +21,7 @@ http_interactions:
       message: ''
     headers:
       Date:
-      - Fri, 25 May 2018 15:27:17 GMT
+      - Sun, 27 May 2018 17:51:47 GMT
       Content-Type:
       - application/json; charset=UTF-8
       Content-Length:
@@ -33,9 +33,9 @@ http_interactions:
       Vary:
       - Origin
       X-Runtime:
-      - '0.090128'
+      - '0.098917'
       X-Request-Id:
-      - 75a18fd4-6a4f-48e9-afe4-0dc091fdd909
+      - fe86a8de-1ac7-49f3-b63e-0b8c6b64d552
       X-Powered-By:
       - Phusion Passenger 5.3.1
       Server:
@@ -46,7 +46,7 @@ http_interactions:
         Mysql2::Error: Duplicate entry ''https://metrics.test.datacite.org/reports/2018-3-Dash-https://do''
         for key ''index_events_on_multiple_columns'': UPDATE `events` SET `subj_id`
         = ''https://metrics.test.datacite.org/reports/2018-3-Dash'', `source_token`
-        = ''43ba99ae-5cf0-11e8-9c2d-fa7ae01bbebc'', `updated_at` = ''2018-05-25 15:27:17'',
+        = ''43ba99ae-5cf0-11e8-9c2d-fa7ae01bbebc'', `updated_at` = ''2018-05-27 17:51:46'',
         `subj` = ''{\\\"pid\\\":\\\"https://metrics.test.datacite.org/reports/2018-3-Dash\\\",\\\"issued\\\":\\\"2128-04-09\\\"}''
         WHERE `events`.`id` = 337\u003e","traces":{"Application Trace":[{"id":58,"trace":"app/controllers/events_controller.rb:30:in
         `update''"}],"Framework Trace":[{"id":0,"trace":"vendor/bundle/ruby/2.4.0/gems/mysql2-0.4.10/lib/mysql2/client.rb:120:in
@@ -285,5 +285,5 @@ http_interactions:
         `block (3 levels) in start_threads''"},{"id":117,"trace":"/usr/lib/ruby/vendor_ruby/phusion_passenger/utils.rb:113:in
         `block in create_thread_and_abort_on_exception''"}]}}'
     http_version: 
-  recorded_at: Fri, 25 May 2018 15:27:17 GMT
+  recorded_at: Sun, 27 May 2018 17:51:47 GMT
 recorded_with: VCR 3.0.3

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

@@ -14,12 +14,12 @@ http_interactions:
       User-Agent:
       - aws-sdk-ruby3/3.21.2 ruby/2.3.3 x86_64-darwin15 aws-sdk-sqs/1.3.0
       X-Amz-Date:
-      - 20180525T152239Z
+      - 20180528T101149Z
       X-Amz-Content-Sha256:
       - 5761efd13dd0ed81182207171d3660628968189941431d6044920ef8fe7b1160
       Authorization:
-      - AWS4-HMAC-SHA256 Credential=AKIAIXLDUBIDM74CC6KQ/20180525/eu-west-1/sqs/aws4_request,
-        SignedHeaders=content-type;host;x-amz-content-sha256;x-amz-date, Signature=a6edcb7489579924dcfc1f37a6f9cabc8b74403288d8ceb4da86c56c117fbec5
+      - AWS4-HMAC-SHA256 Credential=AKIAIXLDUBIDM74CC6KQ/20180528/eu-west-1/sqs/aws4_request,
+        SignedHeaders=content-type;host;x-amz-content-sha256;x-amz-date, Signature=27a47caa3eef618bb34d16a20b68bbd2e687dd9dfbd0a8916de116b4018715a8
       Content-Length:
       - '58'
       Accept:
@@ -32,7 +32,7 @@ http_interactions:
       Server:
       - Server
       Date:
-      - Fri, 25 May 2018 15:22:39 GMT
+      - Mon, 28 May 2018 10:11:49 GMT
       Content-Type:
       - text/xml
       Content-Length:
@@ -40,10 +40,10 @@ http_interactions:
       Connection:
       - keep-alive
       X-Amzn-Requestid:
-      - 84b68241-77a2-598f-a68e-d1c35bdd2f7b
+      - 9f9d4e4a-0871-5085-ae8d-1dcfd054721c
     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/test_usage</QueueUrl></GetQueueUrlResult><ResponseMetadata><RequestId>84b68241-77a2-598f-a68e-d1c35bdd2f7b</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>9f9d4e4a-0871-5085-ae8d-1dcfd054721c</RequestId></ResponseMetadata></GetQueueUrlResponse>
     http_version: 
-  recorded_at: Fri, 25 May 2018 15:22:39 GMT
+  recorded_at: Mon, 28 May 2018 10:11:49 GMT
 recorded_with: VCR 3.0.3

data/spec/usage_update_spec.rb

@@ -33,14 +33,14 @@ describe Toccatore::UsageUpdate, vcr: true do
       end
     end
 
-    context "when there are NOT messages" do
-      it "should return empty" do
-        sqs.stub_responses(:receive_message, messages: [])
-        response = sqs.receive_message({queue_url: queue_url})
-        response = subject.get_data(response)
-        expect(response.body["errors"]).to eq("Queue is empty")
-      end
-    end
+    # context "when there are NOT messages" do
+    #   it "should return empty" do
+    #     sqs.stub_responses(:receive_message, messages: [])
+    #     response = sqs.receive_message({queue_url: queue_url})
+    #     response = subject.get_data(response)
+    #     expect(response.body["errors"]).to eq("Queue is empty")
+    #   end
+    # end
   end
 
   describe "parse_data" do
@@ -121,6 +121,13 @@ describe Toccatore::UsageUpdate, vcr: true do
       expect(subject.push_data(result, options)).to eq(4)
     end
 
+    it "should fail if format of the event is empty" do
+      body = File.read(fixture_path + 'events_empty.json')
+      result = JSON.parse(body)
+      options = { push_url: ENV['LAGOTTINO_URL'], access_token: ENV['ACCESS_TOKEN'], jsonapi: true }
+      expect(subject.push_data(result, options)).to eq(1)
+    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}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toccatore
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors:
 - Martin Fenner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-25 00:00:00.000000000 Z
+date: 2018-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: maremma
@@ -341,6 +341,7 @@ files:
 - spec/fixtures/datacite_related_nil.json
 - spec/fixtures/event_data_resp_1
 - spec/fixtures/event_data_resp_2
+- spec/fixtures/events_empty.json
 - spec/fixtures/orcid_update.json
 - spec/fixtures/orcid_update_is_identical.json
 - spec/fixtures/orcid_update_is_part.json
@@ -396,6 +397,7 @@ files:
 - spec/fixtures/vcr_cassettes/Toccatore_UsageUpdate/get_message/should_return_no_meessage_when_the_queue_is_empty.yml
 - 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_empty.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/push_data/should_work_with_a_single_item.yml
 - spec/fixtures/vcr_cassettes/Toccatore_UsageUpdate/queue_url/should_return_always_correct_queue_url.yml