@@ -1,13 +1,15 @@
-AutoHtml.add_filter(:vimeo).with(:width => 440, :height => 248, :title => false, :byline => false, :portrait => false, :fullscreen => true) do |text, options|
+AutoHtml.add_filter(:vimeo).with(:width => 440, :height => 248, :show_title => false, :fullscreen => true, :show_byline => false, :show_portrait => false) do |text, options|
text.gsub(/http:\/\/(www.)?vimeo\.com\/([A-Za-z0-9._%-]*)((\?|#)\S+)?/) do
vimeo_id = $2
- %{
- <object width="#{options[:width]}" height="#{options[:height]}">
- <param name="allowfullscreen" value="#{options[:fullscreen].blank? ? false : true}" />
- <param name="allowscriptaccess" value="always" />
- <param name="movie" value="http://vimeo.com/moogaloop.swf?clip_id=#{vimeo_id}&server=vimeo.com&show_title=#{options[:title].blank? ? 0 : 1}&show_byline=#{options[:byline].blank? ? 0 : 1}&show_portrait=#{options[:portrait].blank? ? 0 : 1}&color=00adef&fullscreen=#{options[:fullscreen].blank? ? 0 : 1}" />
- <embed src="http://vimeo.com/moogaloop.swf?clip_id=#{vimeo_id}&server=vimeo.com&show_title=#{options[:title].blank? ? 0 : 1}&show_byline=#{options[:byline].blank? ? 0 : 1}&show_portrait=#{options[:portrait].blank? ? 0 : 1}&color=00adef&fullscreen=#{options[:fullscreen].blank? ? 0 : 1}" type="application/x-shockwave-flash" allowfullscreen="#{options[:fullscreen].blank? ? false : true}" allowscriptaccess="always" width="#{options[:width]}" height="#{options[:height]}"></embed>
- </object>
- }
+
+ width = options[:width]
+ height = options[:height]
+
+ allowfullscreen = options[:fullscreen]
+ fullscreen = options[:fullscreen] ? 1 : 0
+ show_title = options[:show_title] ? 1 : 0
+ show_byline = options[:show_byline] ? 1 : 0
+ show_portrait = options[:show_portrait] ? 1 : 0
+ %{<object width="#{width}" height="#{height}"><param name="allowfullscreen" value="#{allowfullscreen}" /><param name="allowscriptaccess" value="always" /><param name="movie" value="http://vimeo.com/moogaloop.swf?clip_id=#{vimeo_id}&server=vimeo.com&show_title=#{show_title}&show_byline=#{show_byline}&show_portrait=#{show_portrait}&color=00adef&fullscreen=#{fullscreen}" /><embed src="http://vimeo.com/moogaloop.swf?clip_id=#{vimeo_id}&server=vimeo.com&show_title=#{show_title}&show_byline=#{show_byline}&show_portrait=#{show_portrait}&color=00adef&fullscreen=#{fullscreen}" type="application/x-shockwave-flash" allowfullscreen="#{allowfullscreen}" allowscriptaccess="always" width="#{options[:width]}" height="#{options[:height]}"></embed></object>}
end
end
\ No newline at end of file
lib/auto_html/filters/vimeo.rb
@@ -27,4 +27,24 @@ class VimeoTest < Test::Unit::TestCase
assert_equal '<object width="300" height="250"><param name="allowfullscreen" value="true" /><param name="allowscriptaccess" value="always" /><param name="movie" value="http://vimeo.com/moogaloop.swf?clip_id=1472714&server=vimeo.com&show_title=0&show_byline=0&show_portrait=0&color=00adef&fullscreen=1" /><embed src="http://vimeo.com/moogaloop.swf?clip_id=1472714&server=vimeo.com&show_title=0&show_byline=0&show_portrait=0&color=00adef&fullscreen=1" type="application/x-shockwave-flash" allowfullscreen="true" allowscriptaccess="always" width="300" height="250"></embed></object>', result
end
+ def test_transform_with_fullscreen_false
+ result = auto_html("http://www.vimeo.com/1472714") { vimeo(:width => 300, :height => 250, :fullscreen => false) }
+ assert_equal '<object width="300" height="250"><param name="allowfullscreen" value="false" /><param name="allowscriptaccess" value="always" /><param name="movie" value="http://vimeo.com/moogaloop.swf?clip_id=1472714&server=vimeo.com&show_title=0&show_byline=0&show_portrait=0&color=00adef&fullscreen=0" /><embed src="http://vimeo.com/moogaloop.swf?clip_id=1472714&server=vimeo.com&show_title=0&show_byline=0&show_portrait=0&color=00adef&fullscreen=0" type="application/x-shockwave-flash" allowfullscreen="false" allowscriptaccess="always" width="300" height="250"></embed></object>', result
+ end
+
+ def test_transform_with_show_title
+ result = auto_html("http://www.vimeo.com/1472714") { vimeo(:width => 300, :height => 250, :show_title => true) }
+ assert_equal '<object width="300" height="250"><param name="allowfullscreen" value="true" /><param name="allowscriptaccess" value="always" /><param name="movie" value="http://vimeo.com/moogaloop.swf?clip_id=1472714&server=vimeo.com&show_title=1&show_byline=0&show_portrait=0&color=00adef&fullscreen=1" /><embed src="http://vimeo.com/moogaloop.swf?clip_id=1472714&server=vimeo.com&show_title=1&show_byline=0&show_portrait=0&color=00adef&fullscreen=1" type="application/x-shockwave-flash" allowfullscreen="true" allowscriptaccess="always" width="300" height="250"></embed></object>', result
+ end
+
+ def test_transform_with_show_byline
+ result = auto_html("http://www.vimeo.com/1472714") { vimeo(:width => 300, :height => 250, :show_title => true, :show_byline => true) }
+ assert_equal '<object width="300" height="250"><param name="allowfullscreen" value="true" /><param name="allowscriptaccess" value="always" /><param name="movie" value="http://vimeo.com/moogaloop.swf?clip_id=1472714&server=vimeo.com&show_title=1&show_byline=1&show_portrait=0&color=00adef&fullscreen=1" /><embed src="http://vimeo.com/moogaloop.swf?clip_id=1472714&server=vimeo.com&show_title=1&show_byline=1&show_portrait=0&color=00adef&fullscreen=1" type="application/x-shockwave-flash" allowfullscreen="true" allowscriptaccess="always" width="300" height="250"></embed></object>', result
+ end
+
+ def test_transform_with_show_show_portrait
+ result = auto_html("http://www.vimeo.com/1472714") { vimeo(:width => 300, :height => 250, :show_title => true, :show_byline => true, :show_portrait => true) }
+ assert_equal '<object width="300" height="250"><param name="allowfullscreen" value="true" /><param name="allowscriptaccess" value="always" /><param name="movie" value="http://vimeo.com/moogaloop.swf?clip_id=1472714&server=vimeo.com&show_title=1&show_byline=1&show_portrait=1&color=00adef&fullscreen=1" /><embed src="http://vimeo.com/moogaloop.swf?clip_id=1472714&server=vimeo.com&show_title=1&show_byline=1&show_portrait=1&color=00adef&fullscreen=1" type="application/x-shockwave-flash" allowfullscreen="true" allowscriptaccess="always" width="300" height="250"></embed></object>', result
+ end
+
end
\ No newline at end of file
test/unit/filters/vimeo_test.rb
d4963c7d7db8824b64016ea02eafc2f47d3c3a22
Dejan Simic
desimic@gmail.com
http://github.com/dejan/auto_html/commit/f827f9f52f64fa4f7b41a8233641a33d2e98d979
f827f9f52f64fa4f7b41a8233641a33d2e98d979
2009-10-28T03:29:14-07:00
2009-10-28T03:29:14-07:00
minor tweaks of recent vimeo filter change
eb7114a40ee4de73bd397f1ef85db67c7c42e381
Dejan Simic
desimic@gmail.com