toccatore 0.4.9 → 0.4.10

data/spec/orcid_update_spec.rb

@@ -66,7 +66,7 @@ describe Toccatore::OrcidUpdate, vcr: true do
       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")
+      expect(doc["doi"]).to eq("10.6084/M9.FIGSHARE.1371006")
     end
 
     it "should allow queries by DOI of the Datacite Metadata Search API" do

data/spec/spec_helper.rb

@@ -111,6 +111,6 @@ VCR.configure do |c|
   c.configure_rspec_metadata!
   c.filter_sensitive_data("<VOLPINO_TOKEN>") { ENV['VOLPINO_TOKEN'] }
   c.filter_sensitive_data("<EVENTDATA_TOKEN>") { ENV['EVENTDATA_TOKEN'] }
-  c.filter_sensitive_data("<LAGOTTO_TOKEN>") { ENV['LAGOTTO_TOKEN'] }
+  c.filter_sensitive_data("<LAGOTTINO_TOKEN>") { ENV['LAGOTTINO_TOKEN'] }
   c.filter_sensitive_data("<SLACK_WEBHOOK_URL>") { ENV['SLACK_WEBHOOK_URL'] }
 end

data/spec/usage_update_spec.rb

@@ -12,26 +12,26 @@ describe Toccatore::UsageUpdate, vcr: true do
 
 
   describe "get_data" do
-    context "when there are messages" do
-      it "should return the data for one message" do
-        sqs.stub_responses(:receive_message, messages: message)
-        sqs.stub_responses(:receive_message, messages: message)
-        sqs.stub_responses(:receive_message, messages: message)
-        sqs.stub_responses(:receive_message, messages: message)
-        response = sqs.receive_message({queue_url: queue_url})
-        response = subject.get_data(response)
-        expect(response.body["data"]["report"]["report-header"]["report-name"]).to eq("Dataset Master Report")
-      end
-    end
+    # context "when there are messages" do
+    #   it "should return the data for one message" do
+    #     sqs.stub_responses(:receive_message, messages: message)
+    #     sqs.stub_responses(:receive_message, messages: message)
+    #     sqs.stub_responses(:receive_message, messages: message)
+    #     sqs.stub_responses(:receive_message, messages: message)
+    #     response = sqs.receive_message({queue_url: queue_url})
+    #     response = subject.get_data(response)
+    #     expect(response.body["data"]["report"]["report-header"]["report-name"]).to eq("Dataset Master Report")
+    #   end
+    # end
 
-    context "when there is ONE message" do
-      it "should return the data for one message" do
-        sqs.stub_responses(:receive_message, messages: message)
-        response = sqs.receive_message({queue_url: queue_url})
-        response = subject.get_data(response)
-        expect(response.body["data"]["report"]["report-header"]["report-name"]).to eq("Dataset Master Report")
-      end
-    end
+    # context "when there is ONE message" do
+    #   it "should return the data for one message" do
+    #     sqs.stub_responses(:receive_message, messages: message)
+    #     response = sqs.receive_message({queue_url: queue_url})
+    #     response = subject.get_data(response)
+    #     expect(response.body["data"]["report"]["report-header"]["report-name"]).to eq("Dataset Master Report")
+    #   end
+    # end
 
     # context "when there are NOT messages" do
     #   it "should return empty" do
@@ -73,35 +73,35 @@ describe Toccatore::UsageUpdate, vcr: true do
     context "when the report was found" do
       it "should parsed it correctly" do
         body = File.read(fixture_path + 'usage_update.json')
-        result = OpenStruct.new(body: JSON.parse(body), url:"https://metrics.test.datacite.org/reports/5cac6ca0-9391-4e1d-95cf-ba2f475cbfad"  )
+        result = OpenStruct.new(body: JSON.parse(body), url:"https://api.test.datacite.org/reports/5cac6ca0-9391-4e1d-95cf-ba2f475cbfad"  )
         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/5cac6ca0-9391-4e1d-95cf-ba2f475cbfad", "issued"=>"2128-04-09"},"total"=>3,"message-action" => "add", "subj-id"=>"https://metrics.test.datacite.org/reports/5cac6ca0-9391-4e1d-95cf-ba2f475cbfad", "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")
+        expect(response.last.except("uuid")).to eq("subj"=>{"pid"=>"https://api.test.datacite.org/reports/5cac6ca0-9391-4e1d-95cf-ba2f475cbfad", "issued"=>"2128-04-09"},"total"=>3,"message-action" => "add", "subj-id"=>"https://api.test.datacite.org/reports/5cac6ca0-9391-4e1d-95cf-ba2f475cbfad", "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" => ENV['SOURCE_TOKEN'])
       end
 
       it "should parsed it correctly when it has five metrics  and two DOIs" do
         body = File.read(fixture_path + 'usage_update_3.json')
-        result = OpenStruct.new(body: JSON.parse(body), url:"https://metrics.test.datacite.org/reports/5cac6ca0-9391-4e1d-95cf-ba2f475cbfad"  )
+        result = OpenStruct.new(body: JSON.parse(body), url:"https://api.test.datacite.org/reports/5cac6ca0-9391-4e1d-95cf-ba2f475cbfad"  )
         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/5cac6ca0-9391-4e1d-95cf-ba2f475cbfad", "subj"=>{"pid"=>"https://metrics.test.datacite.org/reports/5cac6ca0-9391-4e1d-95cf-ba2f475cbfad", "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/")
+        expect(response.last.except("uuid")).to eq("message-action"=>"add", "subj-id"=>"https://api.test.datacite.org/reports/5cac6ca0-9391-4e1d-95cf-ba2f475cbfad", "subj"=>{"pid"=>"https://api.test.datacite.org/reports/5cac6ca0-9391-4e1d-95cf-ba2f475cbfad", "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"=>ENV['SOURCE_TOKEN'], "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
         body = File.read(fixture_path + 'usage_update_2.json')
-        result = OpenStruct.new(body: JSON.parse(body), url:"https://metrics.test.datacite.org/reports/5cac6ca0-9391-4e1d-95cf-ba2f475cbfad" , url:"https://metrics.test.datacite.org/reports/5cac6ca0-9391-4e1d-95cf-ba2f475cbfad" )
+        result = OpenStruct.new(body: JSON.parse(body), url:"https://api.test.datacite.org/reports/5cac6ca0-9391-4e1d-95cf-ba2f475cbfad")
         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/5cac6ca0-9391-4e1d-95cf-ba2f475cbfad", "subj"=>{"pid"=>"https://metrics.test.datacite.org/reports/5cac6ca0-9391-4e1d-95cf-ba2f475cbfad", "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/")
+        expect(response.last.except("uuid")).to eq("message-action"=>"add", "subj-id"=>"https://api.test.datacite.org/reports/5cac6ca0-9391-4e1d-95cf-ba2f475cbfad", "subj"=>{"pid"=>"https://api.test.datacite.org/reports/5cac6ca0-9391-4e1d-95cf-ba2f475cbfad", "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"=>ENV['SOURCE_TOKEN'], "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
         body = File.read(fixture_path + 'usage_update_1.json')
-        result = OpenStruct.new(body: JSON.parse(body), url:"https://metrics.test.datacite.org/reports/5cac6ca0-9391-4e1d-95cf-ba2f475cbfad"  )
+        result = OpenStruct.new(body: JSON.parse(body), url:"https://api.test.datacite.org/reports/5cac6ca0-9391-4e1d-95cf-ba2f475cbfad"  )
         response = subject.parse_data(result, source_token: ENV['SOURCE_TOKEN'])
         expect(response.length).to eq(1)
         expect(subject.parse_data(result)).to be_a(Array)
-        expect(response.last.body).to eq({"errors"=>"There are too many instances in 10.7291/D1Q94R for report https://metrics.test.datacite.org/reports/5cac6ca0-9391-4e1d-95cf-ba2f475cbfad. There can only be 4"})
+        expect(response.last.body).to eq({"errors"=>"There are too many instances in 10.7291/D1Q94R for report https://api.test.datacite.org/reports/5cac6ca0-9391-4e1d-95cf-ba2f475cbfad. There can only be 4"})
       end
     end
   end
@@ -117,28 +117,28 @@ describe Toccatore::UsageUpdate, vcr: true 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['ACCESS_TOKEN'], jsonapi: true }
+      options = { push_url: ENV['LAGOTTINO_URL'], access_token: ENV['LAGOTTINO_TOKEN'], jsonapi: true }
       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)
+      options = { push_url: ENV['LAGOTTINO_URL'], access_token: ENV['LAGOTTINO_TOKEN'], jsonapi: true }
+      expect(subject.push_data(result, options)).to eq(2)
     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['ACCESS_TOKEN'], jsonapi: true }
+    #   options = { push_url: ENV['LAGOTTINO_URL'], access_token: ENV['LAGOTTINO_TOKEN'], jsonapi: true }
     #   expect(subject.push_data(all_events, options)).to eq(0)
     # end
 
     it "should work with a single item" do
       body = File.read(fixture_path + 'usage_events.json')
       result = JSON.parse(body)
-      options = { push_url: ENV['LAGOTTINO_URL'], access_token: ENV['ACCESS_TOKEN'], jsonapi: true }
+      options = { push_url: ENV['LAGOTTINO_URL'], access_token: ENV['LAGOTTINO_TOKEN'], jsonapi: true }
       expect(subject.push_item(result.first, options)).to eq(1)
     end
   end

data/toccatore.gemspec

@@ -16,13 +16,13 @@ Gem::Specification.new do |s|
 
   # Declary dependencies here, rather than in the Gemfile
   
-  s.add_dependency 'maremma', '~> 3.5'
-  s.add_dependency 'activesupport', '~> 4.2', '>= 4.2.5'
+  s.add_dependency 'maremma', '>= 3.5.7', '< 5'
+  s.add_dependency 'activesupport', '>= 4.2.5', '< 6'
   s.add_dependency 'dotenv', '~> 2.1', '>= 2.1.1'
   s.add_dependency 'namae', '~> 0.11.0'
   s.add_dependency 'gender_detector', '~> 1.0'
   s.add_dependency 'thor', '~> 0.19'
-  s.add_dependency 'slack-notifier', '= 2.2.2'
+  s.add_dependency 'slack-notifier', '~> 2.1'
   s.add_dependency 'aws-sdk-sqs'
   s.add_dependency 'factory_bot'
 
@@ -31,9 +31,9 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rake', '~> 12.0'
   s.add_development_dependency 'rack-test', '~> 0'
   s.add_development_dependency 'vcr', '~> 3.0', '>= 3.0.3'
-  s.add_development_dependency 'webmock', '~> 1.22', '>= 1.22.3'
-  s.add_development_dependency 'codeclimate-test-reporter', '~> 1.0', '>= 1.0.0'
-  s.add_development_dependency 'simplecov', '~> 0.12.0'
+  s.add_development_dependency 'webmock', '~> 3.0', '>= 3.0.1'
+  s.add_development_dependency 'codeclimate-test-reporter', "~> 1.0"
+  s.add_development_dependency 'simplecov'
   s.add_development_dependency 'factory_bot'
   s.add_development_dependency 'faker'
 

metadata

@@ -1,49 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: toccatore
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.4.10
 platform: ruby
 authors:
 - Martin Fenner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-28 00:00:00.000000000 Z
+date: 2018-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: maremma
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: 3.5.7
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.5.7
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.2'
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.5
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.2'
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.5
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
@@ -110,16 +116,16 @@ dependencies:
   name: slack-notifier
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: aws-sdk-sqs
   requirement: !ruby/object:Gem::Requirement
@@ -230,20 +236,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.22'
+        version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.22.3
+        version: 3.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.22'
+        version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.22.3
+        version: 3.0.1
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
@@ -251,9 +257,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -261,23 +264,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: factory_bot
   requirement: !ruby/object:Gem::Requirement
@@ -402,7 +402,7 @@ files:
 - 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
 - spec/orcid_update_spec.rb
-- spec/queque_spec.rb
+- spec/queue_spec.rb
 - spec/spec_helper.rb
 - spec/usage_update_spec.rb
 - toccatore.gemspec