maltese 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8575062ca1a56040a8b6d95e04a0b32663326f1
-  data.tar.gz: 9c5da81b4f793717852b5be5b953a88f1ee20b71
+  metadata.gz: c63d39d911bf3128f4977e8689046491a4cd7fd2
+  data.tar.gz: 1d0b468a7f9074dff62a4f5ea7ac24899a9110e2
 SHA512:
-  metadata.gz: 16e61487cbd77588ca95f3c50d18cec28cb96bd6e4ca0ce2ed257c956305e17b5288d52a042d9ca1b228453210c95dc61e5be39d719364587e5096ba62cee62c
-  data.tar.gz: 99a3fca771361d7d2e5f94556de2c319e14f74fbeb5ed7368985aa401ea9def436e25a545130f2fd9591aa0be36a1105d7b454d453123cc75f8268ed9d7aa915
+  metadata.gz: dc76a156939794d41df9c0c3c7af34c7ab90d2eaeea6ce199c2d0ce693031e66523d6dd688a77128812c21b9940cf3091a062f0137d232f6e0ead3693d3bdb22
+  data.tar.gz: 5b9ef60d80b7c69f2f0d988b9886e4a4b2e22bb851c9f576b322a62d573a91ffb2e88b8bfa6cf9259793c626182c41e36acbbaf2b64de628f1eea007ee212b77

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    maltese (0.1.6)
+    maltese (0.1.7)
       activesupport (~> 4.2, >= 4.2.5)
       fog-aws (~> 0.7.6)
       maremma (~> 3.5)

data/lib/maltese/cli.rb

@@ -18,9 +18,9 @@ module Maltese
     end
 
     desc "sitemap", "generate sitemap for DataCite Search"
-    method_option :sitemap_bucket, type: :string, default: ENV['SITEMAP_BUCKET']
-    method_option :from_date, type: :string, default: (Time.now.to_date - 1.day).iso8601
-    method_option :until_date, type: :string, default: Time.now.to_date.iso8601
+    method_option :sitemap_bucket, type: :string
+    method_option :from_date, type: :string
+    method_option :until_date, type: :string
     def sitemap
       sitemap = Maltese::Sitemap.new(options)
       sitemap.queue_jobs

data/lib/maltese/sitemap.rb

@@ -1,6 +1,6 @@
 module Maltese
   class Sitemap
-    attr_reader :sitemap_bucket, :sitemap_url, :from_date, :until_date
+    attr_reader :sitemap_bucket, :from_date, :until_date
 
     # load ENV variables from container environment if json file exists
     # see https://github.com/phusion/baseimage-docker#envvar_dumps
@@ -11,7 +11,7 @@ module Maltese
     end
 
     def initialize(attributes={})
-      @sitemap_bucket = attributes[:sitemap_bucket]|| "search.datacite.org"
+      @sitemap_bucket = attributes[:sitemap_bucket].presence|| "search.datacite.org"
       @from_date = attributes[:from_date].presence || (Time.now.to_date - 1.day).iso8601
       @until_date = attributes[:until_date].presence || Time.now.to_date.iso8601
     end
@@ -25,11 +25,11 @@ module Maltese
     end
 
     def sitemaps_host
-      "http://#{sitemap_bucket}.s3.amazonaws.com/"
+      "https://s3.amazonaws.com/#{sitemap_bucket}/"
     end
 
     def sitemaps_path
-      'sitemaps/'
+      ENV['RACK'] == "test" ? 'sitemaps-test' : 'sitemaps/'
     end
 
     def timeout
@@ -54,7 +54,8 @@ module Maltese
                                       aws_access_key_id: ENV['AWS_ACCESS_KEY_ID'],
                                       aws_secret_access_key: ENV['AWS_SECRET_ACCESS_KEY'],
                                       fog_directory: sitemap_bucket,
-                                      fog_region: ENV['AWS_REGION'])
+                                      fog_region: ENV['AWS_REGION'],
+                                      path_style: true)
     end
 
     def fog_storage
@@ -119,7 +120,7 @@ module Maltese
       Maremma.get(query_url, options)
     end
 
-    def parse_data(result, options={})
+    def parse_data(result)
       return result.body.fetch("errors") if result.body.fetch("errors", nil).present?
 
       items = result.body.fetch("data", {}).fetch('response', {}).fetch('docs', nil)

data/lib/maltese/version.rb

@@ -1,3 +1,3 @@
 module Maltese
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/spec/cli_spec.rb

@@ -6,12 +6,10 @@ describe Maltese::CLI do
     described_class.new
   end
 
-  let(:push_url) { ENV['VOLPINO_URL'] }
-  let(:access_token) { ENV['VOLPINO_TOKEN'] }
   let(:from_date) { "2015-04-07" }
   let(:until_date) { "2015-04-08" }
-  let(:cli_options) { { push_url: push_url,
-                        access_token: access_token,
+  let(:sitemap_bucket) { "search.datacite.org" }
+  let(:cli_options) { { sitemap_bucket: sitemap_bucket,
                         from_date: from_date,
                         until_date: until_date } }
 
@@ -19,7 +17,7 @@ describe Maltese::CLI do
     it 'should succeed' do
       subject.options = cli_options
       expect { subject.sitemap }.to output(/2522 links/).to_stdout
-      sitemap = Zlib::GzipReader.open("public/sitemap.xml.gz") { |gz| gz.read }
+      sitemap = Zlib::GzipReader.open("public/sitemaps-test/sitemap.xml.gz") { |gz| gz.read }
       doc = Nokogiri::XML(sitemap)
       expect(doc.xpath("//xmlns:url").size).to eq(2522)
       expect(doc.xpath("//xmlns:loc").last.text).to eq("https://search.datacite.org/works/10.6084/M9.FIGSHARE.1371139")
@@ -28,16 +26,10 @@ describe Maltese::CLI do
     it 'should succeed with no works' do
       from_date = "2005-04-07"
       until_date = "2005-04-08"
-      subject.options = { push_url: push_url,
-                          access_token: access_token,
+      subject.options = { sitemap_bucket: sitemap_bucket,
                           from_date: from_date,
                           until_date: until_date }
       expect { subject.sitemap }.to output("No works found for date range 2005-04-07 - 2005-04-08.\n").to_stdout
     end
-
-    # it 'should fail' do
-    #   subject.options = cli_options.except(:access_token)
-    #   expect { subject.sitemap }.to output(/An error occured: Access token missing.\n/).to_stdout
-    # end
   end
 end