Merge pull request #18 from francesco-magnoni/patch-1

new-features

Author: eahanson

lib/imageproxy/command.rb

@@ -16,8 +16,10 @@ def execute_command(command_line)
     def curl(url, options={})
       user_agent = options[:user_agent] || "imageproxy"
       timeout = options[:timeout] ? "-m #{options[:timeout]} " : ""
+      authInfo = options[:authInfo]
+      language = options[:language]
       output = options[:output]
-      %|curl #{timeout}-L -f -s -S -A "#{user_agent}" #{output ? "-o #{output} ": ""}"#{url}"|
+      %|curl #{timeout}-L -f -s -S #{language ? "--header \"accept-language: #{language}\" " : ""}  #{authInfo ? "-u #{authInfo} " : ""} -A "#{user_agent}" #{output ? "-o #{output} ": ""}"#{url}"|
     end
 
     def to_path(obj)

lib/imageproxy/convert.rb

@@ -18,12 +18,12 @@ def initialize(options, settings={})
     def execute(user_agent=nil, timeout=nil)
       if options.overlay
         @overlay_file ||= Tempfile.new("imageproxy").tap(&:close)
-        try_command_with_timeout(curl options.overlay, :user_agent => user_agent, :timeout => timeout, :output => @overlay_file.path)
-        try_command_with_timeout curl(options.source, :user_agent => user_agent, :timeout => timeout) +
+        try_command_with_timeout(curl options.overlay, :user_agent => user_agent, :timeout => timeout, :authInfo => options.authInfo, :language => options.language, :output => @overlay_file.path)
+        try_command_with_timeout curl(options.source, :user_agent => user_agent, :timeout => timeout, :authInfo => options.authInfo, :language => options.language) +
                           "| composite #{@overlay_file.path} - - | convert - #{convert_options} #{new_format}#{file.path}"
         file
       else
-        try_command_with_timeout %'#{curl options.source, :user_agent => user_agent, :timeout => timeout} | convert - #{convert_options} #{new_format}#{file.path}'
+        try_command_with_timeout %'#{curl options.source, :user_agent => user_agent, :timeout => timeout, :authInfo => options.authInfo, :language => options.language} | convert - #{convert_options} #{new_format}#{file.path}'
         file
       end
     end