Merge pull request #19 from ConvertAPI/feature/archive-format

Adjust from format when archiving

Author: laurynas-convertapi

lib/convert_api/format_detector.rb

@@ -1,21 +1,28 @@
 module ConvertApi
   class FormatDetector
-    def initialize(resource)
+    ANY_FORMAT = 'any'
+
+    def initialize(resource, to_format)
       @resource = resource
+      @to_format = to_format
     end
 
     def run
+      return ANY_FORMAT if archive?
       return @resource.file_ext.downcase if @resource.is_a?(UploadIO)
 
-      format_from_path
+      format_from_path || raise(FormatError, 'Unable to detect format')
     end
 
     private
 
+    def archive?
+      @to_format.to_s.downcase == 'zip'
+    end
+
     def format_from_path
       extension = File.extname(path).downcase
-      format = extension[1..-1]
-      format || raise(FormatError, 'Unable to detect format')
+      extension[1..-1]
     end
 
     def path

lib/convert_api/task.rb

@@ -66,7 +66,7 @@ def detect_format(params)
 
       resource = params[:File] || Array(params[:Files]).first
 
-      FormatDetector.new(resource).run
+      FormatDetector.new(resource, @to_format).run
     end
 
     def config

spec/convert_api/format_detector_spec.rb

@@ -1,11 +1,19 @@
 RSpec.describe ConvertApi::FormatDetector, '#run' do
-  subject { described_class.new(resource).run }
+  subject { described_class.new(resource, to_format).run }
+
+  let(:to_format) { 'pdf' }
 
   context 'with file name' do
     let(:resource) { 'test.txt' }
     it { is_expected.to eq('txt') }
   end
 
+  context 'when archiving' do
+    let(:resource) { 'test.txt' }
+    let(:to_format) { 'zip' }
+    it { is_expected.to eq('any') }
+  end
+
   context 'with file path' do
     let(:resource) { '/some/path/test.txt' }
     it { is_expected.to eq('txt') }

spec/convert_api_spec.rb

@@ -51,12 +51,6 @@
 
     it_behaves_like 'successful conversion'
 
-    context 'with web resource' do
-      let(:params) { { Url: 'http://convertapi.com' } }
-
-      it_behaves_like 'successful conversion'
-    end
-
     context 'with web resource' do
       let(:from_format) { 'web' }
       let(:params) { { Url: 'http://convertapi.com' } }