geoblacklight 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59d0205c4e07a131e2b5428ed95c147063845cd9
-  data.tar.gz: 5b25ed07db81ba2ba79f0a9ba910708883d98c21
+  metadata.gz: a389fc333cbe630a7ac3660914238f022e23bff8
+  data.tar.gz: 2bce6269f6d334bc6b9dc26a67adc45fc4da5404
 SHA512:
-  metadata.gz: 6293951f6b7f5adc3f98d97517f79fd89c8f0be0178276820db43c0f74552253f4ee4df0c49418739bbb0659cda9702bd01e0d937a04534feabe37b501e0a6a6
-  data.tar.gz: 1c399c1039db4db32a724e1d76730e7b9932ca279a5220d0af7f3e85b638c9a1313e62e393a9d7b15bdd4eb222fcee48ddaf610ae5b3112a9cacf144bd9e47ba
+  metadata.gz: c0dcb5fab1faeec1b5717df0e1fe30ee6b72895b360e02ffc76bac454b08106565620b60e2d1d2de14b69500f04c876726e2da7672ff9d2053d6ed2751aee62c
+  data.tar.gz: bb025868024d82323684086345dcb387382e3bf6485d7f0f4dbaa1070e96a827c42a8b7c58f4cad06af868bda63f54a89049d386a9ec63d934bb61d7c44a2dea

data/app/controllers/download_controller.rb

@@ -32,7 +32,7 @@ class DownloadController < ApplicationController
     # Grab the solr document to check if it should be public or not
     @response, @document = fetch(file_name_to_id(params[:id]))
     restricted_should_authenticate
-    send_file "tmp/cache/downloads/#{params[:id]}.#{params[:format]}", type: 'application/zip', x_sendfile: true
+    send_file download_file_path_and_name, type: 'application/zip', x_sendfile: true
   end
 
   def hgl
@@ -75,6 +75,10 @@ class DownloadController < ApplicationController
 
   private
 
+  def download_file_path_and_name
+    "#{Geoblacklight::Download.file_path}/#{params[:id]}.#{params[:format]}"
+  end
+
   def check_type
     response = case params[:type]
     when 'shapefile'

data/lib/geoblacklight/download.rb

@@ -13,12 +13,16 @@ module Geoblacklight
       "#{@document[:layer_slug_s]}-#{@options[:type]}.#{@options[:extension]}"
     end
 
-    def file_path
+    def self.file_path
       Settings.DOWNLOAD_PATH || "#{Rails.root}/tmp/cache/downloads"
     end
 
+    def file_path_and_name
+      "#{self.class.file_path}/#{file_name}"
+    end
+
     def download_exists?
-      File.file?(file_path)
+      File.file?(file_path_and_name)
     end
 
     def get
@@ -35,18 +39,18 @@ module Geoblacklight
     # @return [String] filename of the completed download
     def create_download_file
       download = initiate_download
-      File.open("#{file_path}/#{file_name}.tmp", 'wb')  do |file|
+      File.open("#{file_path_and_name}.tmp", 'wb')  do |file|
         if download.headers['content-type'] == @options[:content_type]
           file.write download.body
         else
           fail Geoblacklight::Exceptions::WrongDownloadFormat
         end
       end
-      File.rename("#{file_path}/#{file_name}.tmp", "#{file_path}/#{file_name}")
+      File.rename("#{file_path_and_name}.tmp", "#{file_path_and_name}")
       file_name
     rescue Geoblacklight::Exceptions::WrongDownloadFormat => error
       Geoblacklight.logger.error "#{error} expected #{@options[:content_type]} received #{download.headers['content-type']}"
-      File.delete("#{file_path}/#{file_name}.tmp")
+      File.delete("#{file_path_and_name}.tmp")
       raise Geoblacklight::Exceptions::ExternalDownloadFailed, message: 'Wrong download type'
     end
 

data/lib/geoblacklight/version.rb

@@ -1,3 +1,3 @@
 module Geoblacklight
-  VERSION = '0.9.0'
+  VERSION = '0.9.1'
 end

data/spec/lib/geoblacklight/download_spec.rb

@@ -20,11 +20,11 @@ describe Geoblacklight::Download do
   end
   describe '#file_path' do
     it 'should return the path with name and extension' do
-      expect(download.file_path).to eq "#{Rails.root}/tmp/cache/downloads"
+      expect(download.class.file_path).to eq "#{Rails.root}/tmp/cache/downloads"
     end
     it 'should be configurable' do
       expect(Settings).to receive(:DOWNLOAD_PATH).and_return('configured/path')
-      expect(download.file_path).to eq 'configured/path'
+      expect(download.class.file_path).to eq 'configured/path'
     end
   end
   describe '#download_exists?' do
@@ -45,7 +45,7 @@ describe Geoblacklight::Download do
     it 'should call create_download_file if it does not exist' do
       expect(download).to receive(:download_exists?).and_return(false)
       expect(download).to receive(:initiate_download).and_return(object: 'file')
-      expect(File).to receive(:open).with("#{download.file_path}/#{download.file_name}.tmp", 'wb').and_return('')
+      expect(File).to receive(:open).with("#{download.file_path_and_name}.tmp", 'wb').and_return('')
       expect(File).to receive(:rename)
       expect(download.get).to eq 'test-shapefile.zip'
     end
@@ -54,13 +54,13 @@ describe Geoblacklight::Download do
     it 'should create the file in fs and delete it if the content headers are not correct' do
       bad_file = OpenStruct.new(headers: { 'content-type' => 'bad/file' })
       expect(download).to receive(:initiate_download).and_return(bad_file)
-      expect(File).to receive(:delete).with("#{download.file_path}/#{download.file_name}.tmp").and_return(nil)
+      expect(File).to receive(:delete).with("#{download.file_path_and_name}.tmp").and_return(nil)
       expect { download.create_download_file }.to raise_error(Geoblacklight::Exceptions::ExternalDownloadFailed, 'Wrong download type')
     end
     it 'should create the file, write it, and then rename from tmp if everything is ok' do
       shapefile = OpenStruct.new(headers: {'content-type' => 'application/zip'})
       expect(download).to receive(:initiate_download).and_return(shapefile)
-      expect(File).to receive(:open).with("#{download.file_path}/#{download.file_name}.tmp", 'wb').and_return('')
+      expect(File).to receive(:open).with("#{download.file_path_and_name}.tmp", 'wb').and_return('')
       expect(File).to receive(:rename)
       expect(download.create_download_file).to eq download.file_name
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geoblacklight
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Mike Graves
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-08 00:00:00.000000000 Z
+date: 2015-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight