reuse common video/audio tags code and do not modify options

1 files changed, 21 insertions, 25 deletions

diff --git a/actionpack/lib/action_view/helpers/asset_tag_helper.rb b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
index 93092ceeb4..280e51549e 100644
--- a/actionpack/lib/action_view/helpers/asset_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
@@ -416,22 +416,12 @@ module ActionView
       #  video_tag(["trailer.ogg", "trailer.flv"] :size => "160x120") # =>
       #    <video height="120" width="160"><source src="/videos/trailer.ogg" /><source src="/videos/trailer.flv" /></video>
       def video_tag(*sources)
-        options = sources.extract_options!.symbolize_keys!
-        sources.flatten!
+        multiple_sources_tag('video', sources) do |options|
+          options[:poster] = path_to_image(options[:poster]) if options[:poster]
 
-        options[:poster] = path_to_image(options[:poster]) if options[:poster]
-
-        if size = options.delete(:size)
-          options[:width], options[:height] = size.split("x") if size =~ %r{^\d+x\d+$}
-        end
-
-        if sources.size > 1
-          content_tag("video", options) do
-            safe_join sources.map { |source| tag("source", :src => path_to_video(source)) }
+          if size = options.delete(:size)
+            options[:width], options[:height] = size.split("x") if size =~ %r{^\d+x\d+$}
           end
-        else
-          options[:src] = path_to_video(sources.first)
-          tag("video", options)
         end
       end
 
@@ -449,17 +439,7 @@ module ActionView
       #  audio_tag("sound.wav", "sound.mid")  # =>
       #    <audio><source src="/audios/sound.wav" /><source src="/audios/sound.mid" /></audio>
       def audio_tag(*sources)
-        options = sources.extract_options!.symbolize_keys!
-        sources.flatten!
-
-        if sources.size > 1
-          content_tag("audio", options) do
-            safe_join sources.collect { |source| tag("source", :src => path_to_audio(source)) }
-          end
-        else
-          options[:src] = path_to_audio(sources.first)
-          tag("audio", options)
-        end
+        multiple_sources_tag('audio', sources)
       end
 
       private
@@ -467,6 +447,22 @@ module ActionView
         def asset_paths
           @asset_paths ||= AssetTagHelper::AssetPaths.new(config, controller)
         end
+
+        def multiple_sources_tag(type, sources)
+          options = sources.extract_options!.dup.symbolize_keys!
+          sources.flatten!
+
+          yield options if block_given?
+
+          if sources.size > 1
+            content_tag(type, options) do
+              safe_join sources.map { |source| tag("source", :src => send("path_to_#{type}", source)) }
+            end
+          else
+            options[:src] = send("path_to_#{type}", sources.first)
+            tag(type, options)
+          end
+        end
     end
   end
 end