maltese 0.9.4 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9b033d429a2c7fc65f0ace4cb25ed1b2ca1d4a9936fe37577c4df6ffe0b66ef
-  data.tar.gz: 82de3dc19a541a178776666900f3699e49db594d9913708acd4c81b62fb72938
+  metadata.gz: b8da994f0754cfeac0ebbf1621f0fdcfd3b733a39aa4e585194a0e740ccc3cfb
+  data.tar.gz: f30eaf6e92db60dcc2f09af4236e59a660b733596036b7e9cbe19682eba98cfb
 SHA512:
-  metadata.gz: 412ab3cd8434a4e8c58f87a46d6fe034e479d0885ab82aca782ef01451e96597a75c814242b6300cdb2fcd6a729fbca1598bad5a849cd3369e591352b9777eef
-  data.tar.gz: 75ff7e0f61e8eaa2f5c455c0e05f0593bbac126222a378217b2569e5e70b9e39028672befec08710ab2f771e1efe831668409d68aae56f33ec0e2cfd1a001a9a
+  metadata.gz: acae0001e505da772b326f6139abaa3c28df70f26dea5d68978a2e6c9c1969ae222c107814540ece4019b78c0c26be85c400896caec3e0995e5013057209abb5
+  data.tar.gz: 2f2a704e1e5c2caf4f394355f56d008dfc73dfa6484cff149a7a55d8c5ce0cc0fc601c5c57306b8dc24f8f58a0e0187774045275469a2c323cbc5a907147449d

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.4
+RUN /sbin/setuser app gem install maltese -v 0.9.5
 
 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.4)
+    maltese (0.9.5)
       activesupport (>= 4.2.5, < 6)
       aws-sdk-s3 (~> 1.19)
       dotenv (~> 2.1, >= 2.1.1)

data/lib/maltese.rb

@@ -1,6 +1,6 @@
 require 'sitemap_generator'
-require 'maremma'
 require 'aws-sdk-s3'
+require 'maremma'
 require 'mime/types'
 require 'active_support/all'
 

data/lib/maltese/sitemap.rb

@@ -120,8 +120,11 @@ module Maltese
         begin
           response = nil
 
+          # speed up tests
+          base_interval = rack_env == "test" ? 0.1 : 10
+
           # retry on temporal errors (status codes 408 and 502)
-          Retriable.retriable(base_interval: 10, multiplier: 2) do
+          Retriable.retriable(base_interval: base_interval, multiplier: 2) do
             response = get_data(options[:url])
 
             raise Timeout::Error, "A timeout error occured for URL #{options[:url]}." if response.status == 408
@@ -130,7 +133,7 @@ module Maltese
 
           if response.status == 200
             link_count = parse_data(response)
-            logger.info "#{link_count} DOIs parsed."
+            logger.info "#{(link_count + sitemap.sitemap_index.total_link_count).to_s(:delimited)} DOIs parsed."
             options[:url] = response.body.dig("links", "next")
           else
             logger.error "An error occured for URL #{options[:url]}."
@@ -143,6 +146,8 @@ module Maltese
           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 },
+            { title: "Number of Sitemaps", value: sitemap.sitemap_index.link_count.to_s(:delimited), short: true },
             { title: "Time Taken", value: "#{((Time.now - options[:start_time])/ 60.0).ceil} min", short: true }
           ]
           send_notification_to_slack(nil, title: slack_title + ": Sitemaps Not Updated", level: "danger", fields: fields) unless rack_env == "test"
@@ -176,8 +181,9 @@ module Maltese
       sitemap.sitemap_index.stats_summary(:time_taken => Time.now - options[:start_time])
       
       fields = [
-        { title: "URL", value: "#{sitemap_url}sitemaps/sitemap.xml.gz" },
-        { title: "Number of DOIs", value: format_number(sitemap.sitemap.link_count), short: true },
+        { title: "URL", value: sitemap.sitemap_index_url },
+        { title: "Number of DOIs", value: sitemap.sitemap_index.total_link_count.to_s(:delimited), short: true },
+        { title: "Number of Sitemaps", value: sitemap.sitemap_index.link_count.to_s(:delimited), short: true },
         { title: "Time Taken", value: "#{((Time.now - options[:start_time])/ 60.0).ceil} min", short: true }
       ]
       send_notification_to_slack(nil, title: slack_title + ": Sitemaps Updated", level: "good", fields: fields) unless rack_env == "test"
@@ -204,10 +210,5 @@ module Maltese
         logger.error exception.message
       end
     end
-
-    # from https://codereview.stackexchange.com/questions/28054/separate-numbers-with-commas
-    def format_number(number)
-      number.to_s.reverse.gsub(/(\d{3})(?=\d)/, '\\1,').reverse
-    end
   end
 end

data/lib/maltese/version.rb

@@ -1,3 +1,3 @@
 module Maltese
-  VERSION = "0.9.4"
+  VERSION = "0.9.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: maltese
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors:
 - Martin Fenner