maltese 0.9.7 → 0.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd87da05843c09dcf82c4402bff44c0e4ab451c9f326cc4ec1078f25cbf8328a
-  data.tar.gz: c37343dda36c0b1753da3739749ada24012e7a0c3f8288a63c65857acfaf2bf2
+  metadata.gz: 0d1525824890a2cf88d5783a644dc1583b912c1e32652b4913b2bf0a0ead0615
+  data.tar.gz: 6e405e2b5b87c89bb72fd753626862cf53b18dbd80a7e1ac0064aa3f23054ac0
 SHA512:
-  metadata.gz: 19fb83f8685ceaa291f361956ad1a5f2b562951e007566be4f188bd8ec55855b3bf017cda37e74539b11c99f8267fe00c2c4e72591673fd9e68691089ed60a5e
-  data.tar.gz: 10d69e6e58de77391ac05ac271ebeeeeb8c337b2f37649f9e8ad51fbc36422342bcef5e9fa64847ef89d5bf67498496cfc85171d5fbbc037d2584f9827139c7a
+  metadata.gz: 9056e4c7fee423af0a7c224680bc5178e87e5410491e088271084e68fccb29fd7ff11be2de51e6ab77e2cb7d4dbf0cb3327fc6ed53bf5489bf6bdc80c1e44b41
+  data.tar.gz: ee6b63a455a0914eb90754e48721801c9bc7a61a2dc85cffd2b1b0649ced391ee20ec24d03a493bde25deb9f47e6891c9882c43dd9f8ed014049dc972e690813

data/Dockerfile

@@ -11,6 +11,6 @@ RUN apt-get update && apt-get upgrade -y -o Dpkg::Options::="--force-confold" &&
     apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 # Install maltese gem
-RUN /sbin/setuser app gem install maltese -v 0.9.7
+RUN /sbin/setuser app gem install maltese -v 0.9.8
 
 CMD maltese sitemap --sitemap_bucket $SITEMAP_BUCKET --rack_env $RACK_ENV --access_key $AWS_ACCESS_KEY_ID --secret_key $AWS_SECRET_ACCESS_KEY --region $AWS_REGION --slack_webhook_url $SLACK_WEBHOOK_URL

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    maltese (0.9.7)
+    maltese (0.9.8)
       activesupport (>= 4.2.5, < 6)
       aws-sdk-s3 (~> 1.19)
       dotenv (~> 2.1, >= 2.1.1)
@@ -25,7 +25,7 @@ GEM
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     aws-eventstream (1.0.3)
-    aws-partitions (1.253.0)
+    aws-partitions (1.254.0)
     aws-sdk-core (3.85.1)
       aws-eventstream (~> 1.0, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)

data/lib/maltese/sitemap.rb

@@ -115,7 +115,6 @@ module Maltese
     def process_data(options = {})
       options[:start_time] = Time.now
       link_count = 0
-      error_count = 0
 
       # walk through paginated results
       while options[:url] do
@@ -141,12 +140,10 @@ module Maltese
           else
             logger.error "An error occured for URL #{options[:url]}."
             logger.error "Error: #{response.body.fetch("errors").inspect}" if response.body.fetch("errors", nil).present?
-            error_count += 1
             options[:url] = nil
           end
         rescue => exception
           logger.error "Error: #{exception.message}"
-          error_count += 1
           fields = [
             { title: "Error", value: exception.message },
             { title: "Number of DOIs", value: sitemap.sitemap_index.total_link_count.to_s(:delimited), short: true },
@@ -202,12 +199,12 @@ module Maltese
       }.compact
 
       begin
-        notifier = Slack::Notifier.new slack_webhook_url,
-                                      username: "Fabrica",
-                                      icon_url: SLACK_ICON_URL
+        notifier = Slack::Notifier.new(slack_webhook_url,
+                                       username: "Fabrica",
+                                       icon_url: SLACK_ICON_URL)
         response = notifier.ping attachments: [attachment]
         response.first.body
-      rescue Slack::Notifier::APIError => exception
+      rescue => exception
         logger.error exception.message
       end
     end

data/lib/maltese/version.rb

@@ -1,3 +1,3 @@
 module Maltese
-  VERSION = "0.9.7"
+  VERSION = "0.9.8"
 end

data/spec/fixtures/vcr_cassettes/Maltese_Sitemap/send_notification_to_slack/send_error.yml

@@ -0,0 +1,58 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: "<SLACK_WEBHOOK_URL>"
+    body:
+      encoding: US-ASCII
+      string: payload=%7B%22username%22%3A%22Fabrica%22%2C%22icon_url%22%3A%22https%3A%2F%2Fgithub.com%2Fdatacite%2Fsegugio%2Fblob%2Fmaster%2Fsource%2Fimages%2Ffabrica.png%22%2C%22attachments%22%3A%5B%7B%22title%22%3A%22DataCite+Fabrica+Test%3A+Sitemaps+Not+Updated%22%2C%22color%22%3A%22danger%22%2C%22fields%22%3A%5B%7B%22title%22%3A%22Error%22%2C%22value%22%3A%22Error%3A+A+bad+gateway+error+occured+for+URL+https%3A%2F%2Fapi.datacite.org%2Fdois%3Fpage%255Bscroll%255D%3D7m%5Cu0026page%255Bsize%255D%3D1000%5Cu0026scroll-id%3DDnF1ZXJ5VGhlbkZldGNoBQAAAAACJPb5FjI5NUhiM3dqU0JleHRSWlJGTnhYaXcAAAAAAiT2-hYyOTVIYjN3alNCZXh0UlpSRk54WGl3AAAAAAIk9vsWMjk1SGIzd2pTQmV4dFJaUkZOeFhpdwAAAAACJPb8FjI5NUhiM3dqU0JleHRSWlJGTnhYaXcAAAAAAiT2_RYyOTVIYjN3alNCZXh0UlpSRk54WGl3.%22%7D%2C%7B%22title%22%3A%22Number+of+DOIs%22%2C%22value%22%3A%22141%2C572%22%2C%22short%22%3Atrue%7D%2C%7B%22title%22%3A%22Number+of+Sitemaps%22%2C%22value%22%3A%223%22%2C%22short%22%3Atrue%7D%2C%7B%22title%22%3A%22Time+Taken%22%2C%22value%22%3A%2217+min%22%2C%22short%22%3Atrue%7D%5D%7D%5D%7D
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+      Content-Type:
+      - application/x-www-form-urlencoded
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Content-Type:
+      - text/html
+      Content-Length:
+      - '22'
+      Connection:
+      - keep-alive
+      Date:
+      - Fri, 13 Dec 2019 08:57:43 GMT
+      Server:
+      - Apache
+      Vary:
+      - Accept-Encoding
+      Strict-Transport-Security:
+      - max-age=31536000; includeSubDomains; preload
+      Referrer-Policy:
+      - no-referrer
+      X-Frame-Options:
+      - SAMEORIGIN
+      Access-Control-Allow-Origin:
+      - "*"
+      X-Via:
+      - haproxy-www-v6ip
+      X-Cache:
+      - Miss from cloudfront
+      Via:
+      - 1.1 df38bb2685583a05a05461e9dbcff65d.cloudfront.net (CloudFront)
+      X-Amz-Cf-Pop:
+      - MAN50-C1
+      X-Amz-Cf-Id:
+      - qCYumwTrzsq02_b9c1ZbCmluNSOrd6KyiQsfnenvF4r2TEcXj-ruWQ==
+    body:
+      encoding: ASCII-8BIT
+      string: ok
+    http_version: 
+  recorded_at: Fri, 13 Dec 2019 08:57:43 GMT
+recorded_with: VCR 3.0.3

data/spec/fixtures/vcr_cassettes/Maltese_Sitemap/send_notification_to_slack/send_info.yml

@@ -0,0 +1,58 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: "<SLACK_WEBHOOK_URL>"
+    body:
+      encoding: US-ASCII
+      string: payload=%7B%22username%22%3A%22Fabrica%22%2C%22icon_url%22%3A%22https%3A%2F%2Fgithub.com%2Fdatacite%2Fsegugio%2Fblob%2Fmaster%2Fsource%2Fimages%2Ffabrica.png%22%2C%22attachments%22%3A%5B%7B%22title%22%3A%22DataCite+Fabrica+Test%3A+Sitemaps+Updated%22%2C%22color%22%3A%22good%22%2C%22fields%22%3A%5B%7B%22title%22%3A%22URL%22%2C%22value%22%3A%22https%3A%2F%2Fsearch.test.datacite.org%2Fsitemaps%2Fsitemap.xml.gz%22%7D%2C%7B%22title%22%3A%22Number+of+DOIs%22%2C%22value%22%3A%22271%2C605%22%2C%22short%22%3Atrue%7D%2C%7B%22title%22%3A%22Number+of+Sitemaps%22%2C%22value%22%3A%226%22%2C%22short%22%3Atrue%7D%2C%7B%22title%22%3A%22Time+Taken%22%2C%22value%22%3A%2233+min%22%2C%22short%22%3Atrue%7D%5D%7D%5D%7D
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+      Content-Type:
+      - application/x-www-form-urlencoded
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Content-Type:
+      - text/html
+      Content-Length:
+      - '22'
+      Connection:
+      - keep-alive
+      Date:
+      - Fri, 13 Dec 2019 08:53:10 GMT
+      Server:
+      - Apache
+      Vary:
+      - Accept-Encoding
+      Strict-Transport-Security:
+      - max-age=31536000; includeSubDomains; preload
+      Referrer-Policy:
+      - no-referrer
+      X-Frame-Options:
+      - SAMEORIGIN
+      Access-Control-Allow-Origin:
+      - "*"
+      X-Via:
+      - haproxy-www-67jr
+      X-Cache:
+      - Miss from cloudfront
+      Via:
+      - 1.1 e05f0ff5c1cc82faec67b7a1bf62aedb.cloudfront.net (CloudFront)
+      X-Amz-Cf-Pop:
+      - MAD51-C1
+      X-Amz-Cf-Id:
+      - mWI0IuqEsQvmiAy2C0KyOpDW_PgVKm0w9G91v80N_omXTNSsTxxR3A==
+    body:
+      encoding: ASCII-8BIT
+      string: ok
+    http_version: 
+  recorded_at: Fri, 13 Dec 2019 08:53:11 GMT
+recorded_with: VCR 3.0.3

data/spec/sitemap_spec.rb

@@ -103,4 +103,26 @@ describe Maltese::Sitemap, vcr: true do
       expect { subject.push_data }.to output(/1001 links/).to_stdout
     end
   end
+
+  context "send_notification_to_slack" do
+    it "send info" do
+      fields = [
+        { title: "URL", value: "https://search.test.datacite.org/sitemaps/sitemap.xml.gz" },
+        { title: "Number of DOIs", value: 271605.to_s(:delimited), short: true },
+        { title: "Number of Sitemaps", value: 6.to_s(:delimited), short: true },
+        { title: "Time Taken", value: "33 min", short: true }
+      ]
+      expect(subject.send_notification_to_slack(nil, title: subject.slack_title + ": Sitemaps Updated", level: "good", fields: fields)).to eq("ok")
+    end
+
+    it "send error" do
+      fields = [
+        { title: "Error", value: "Error: A bad gateway error occured for URL https://api.datacite.org/dois?page%5Bscroll%5D=7m&page%5Bsize%5D=1000&scroll-id=DnF1ZXJ5VGhlbkZldGNoBQAAAAACJPb5FjI5NUhiM3dqU0JleHRSWlJGTnhYaXcAAAAAAiT2-hYyOTVIYjN3alNCZXh0UlpSRk54WGl3AAAAAAIk9vsWMjk1SGIzd2pTQmV4dFJaUkZOeFhpdwAAAAACJPb8FjI5NUhiM3dqU0JleHRSWlJGTnhYaXcAAAAAAiT2_RYyOTVIYjN3alNCZXh0UlpSRk54WGl3." },
+        { title: "Number of DOIs", value: 141572.to_s(:delimited), short: true },
+        { title: "Number of Sitemaps", value: 3.to_s(:delimited), short: true },
+        { title: "Time Taken", value: "17 min", short: true }
+      ]
+      expect(subject.send_notification_to_slack(nil, title: subject.slack_title + ": Sitemaps Not Updated", level: "danger", fields: fields)).to eq("ok")
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maltese
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors:
 - Martin Fenner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-12 00:00:00.000000000 Z
+date: 2019-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: maremma
@@ -343,6 +343,8 @@ files:
 - spec/fixtures/vcr_cassettes/Maltese_Sitemap/push_data/should_report_if_there_are_no_works_returned_by_the_Datacite_REST_API.yml
 - spec/fixtures/vcr_cassettes/Maltese_Sitemap/push_data/should_report_if_there_are_works_returned_by_the_Datacite_REST_API.yml
 - spec/fixtures/vcr_cassettes/Maltese_Sitemap/queue_jobs/should_report_if_there_are_works_returned_by_the_Datacite_REST_API.yml
+- spec/fixtures/vcr_cassettes/Maltese_Sitemap/send_notification_to_slack/send_error.yml
+- spec/fixtures/vcr_cassettes/Maltese_Sitemap/send_notification_to_slack/send_info.yml
 - spec/sitemap_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/datacite/maltese