upload.rb in zena-1.2.8

- old
+ new

@@ -29,10 +29,15 @@
           end
       end # UploadedFile
 
       module ControllerMethods
         include UploadedFile
+        
+        def self.included(base)
+          base.send(:helper_method, :fetch_html)
+        end
+        
         protected
           include ActionView::Helpers::NumberHelper # number_to_human_size
           def get_attachment
             att, error = nil, nil
             if !params['attachment_url'].blank?
@@ -42,10 +47,18 @@
             end
             yield(att, error) if block_given?
             [att, error]
           end
           
+          def fetch_html(uri_str)
+            response, error = fetch_response(uri_str)
+            if response
+              response.body
+            else
+              ''
+            end
+          end
 
         private
           def fetch_uri(uri_str, max_file_size = 10)
             max_file_size = max_file_size * 1024 * 1024 # Mo
 
@@ -174,9 +187,10 @@
           end
       end # ControllerMethods
 
       module ViewMethods
         include RubyLess
+        safe_method [:fetch_html, String] => String
 
         def upload_form_tag(url_opts, html_opts = {})
           @uuid = UUIDTools::UUID.random_create.to_s.gsub('-','')
           html_opts.reverse_merge!(:multipart => true, :id => "UploadForm#{@uuid}")
           if html_opts[:multipart]
\ No newline at end of file