maltese 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f584e6a0daeb400ae4afc532f0e42a98e2211b4b0e6764a64d92a551bf933f4
-  data.tar.gz: 1474fc79d473c5274c738d6771697cb50ff5b6632caabbe7f5e079fe043c2af9
+  metadata.gz: b164d7b559b700d446fa188db4ec7709da66090345f5c7812b63a159ee37e498
+  data.tar.gz: e18e182c07263de4a85e6e5100d6db4657ea9b11751746c8c11ba75ab5511a78
 SHA512:
-  metadata.gz: c97d20279a1bb40fe804bc1af2fe653d4864a60a20694008e74dacb7305331d06de304c37d2de14a1a6f851e2b5362acdab6a028b6822d95e186a651fe205ae8
-  data.tar.gz: fe140ba2ef6c35523284fc0a36f26fc45ce449b0c9c25c0f2f31bd12f6f3d717c3f4acfea00c162a37b5be4b1735963d8c8522fcf86ad68dc996ba2aca846622
+  metadata.gz: fed1c2951942238010cbfdeca20b1de77174037868052fdf80b9f9c95d7a6a1aab4a2d18fc9e895185157346e549098ff06f095ffc82cb0e7085d442bc413fac
+  data.tar.gz: e610158f1267a2f4dac264c70383a3734a881298e1f05e1dd9baf424a3a34e099b57dc186c355ee4f0e74a998972d65f5d11541d3e6f9d4e775da7d3c054815d

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.8.2
+RUN /sbin/setuser app gem install maltese -v 0.8.3
 
 CMD maltese sitemap --sitemap_bucket $SITEMAP_BUCKET

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    maltese (0.8.2)
+    maltese (0.8.3)
       activesupport (>= 4.2.5, < 6)
       aws-sdk-s3 (~> 1.19)
       dotenv (~> 2.1, >= 2.1.1)

data/lib/maltese/sitemap.rb

@@ -61,7 +61,7 @@ module Maltese
       total = get_total(options)
 
       if total > 0
-        puts process_data(options.merge(total: total, cursor: 1))
+        puts process_data(options.merge(total: total, url: get_query_url))
       else
         puts "No works found."
       end
@@ -92,19 +92,20 @@ module Maltese
       options[:start_time] = Time.now
 
       # walk through paginated results
-      while options[:cursor] do
-        data = get_data(options.merge(timeout: timeout))
-        options[:cursor] = data.dig("links", "next")
-        parse_data(data)
+      while options[:url] do
+        response = get_data(options[:url])
+        parse_data(response)
+        options[:url] = response.body.dig("links", "next")
+
+        # don't loop when testing
+        break if ENV['RACK'] == "test"     
       end
 
       push_data(options)
     end
 
-    def get_data(options={})
-      query_url = get_query_url(options)
-
-      Maremma.get(query_url, options)
+    def get_data(url)
+      Maremma.get(url)
     end
 
     def parse_data(result)

data/lib/maltese/version.rb

@@ -1,3 +1,3 @@
 module Maltese
-  VERSION = "0.8.2"
+  VERSION = "0.8.3"
 end

data/spec/cli_spec.rb

@@ -12,7 +12,7 @@ describe Maltese::CLI do
   describe "sitemap", vcr: true, :order => :defined do
     it 'should succeed' do
       subject.options = cli_options
-      expect { subject.sitemap }.to output(/1 links/).to_stdout
+      expect { subject.sitemap }.to output(/1001 links/).to_stdout
       sitemap = Zlib::GzipReader.open("public/sitemaps/sitemap.xml.gz") { |gz| gz.read }
       doc = Nokogiri::XML(sitemap)
       expect(doc.xpath("//xmlns:url").size).to eq(1001)