@@ -1,7 +1,7 @@ Gem::Specification.new do |s| s.name = "acts_as_video_fu" - s.version = "1.2" - s.date = "2009-03-06" + s.version = "1.3" + s.date = "2009-03-15" s.summary = "Rails plugin that easily allows you to show video streams on your site." s.email = "matt@matt-darby.com" s.homepage = "http://github.com/mdarby/acts_as_video_fu/tree/master" acts_as_video_fu.gemspec @@ -2,18 +2,18 @@ module Mdarby module Acts #:nodoc: module Acts_as_video_fu #:nodoc: - VIMEO_RE = /^http:\/\/(www\.vimeo|vimeo)\.com\/[0-9]*$/ - YOUTUBE_RE = /^http:\/\/(www\.youtube|youtube)\.com\/watch\?v=[^&]*$/ + VIMEO_RE = /^http:\/\/(www\.vimeo|vimeo)\.com\/[0-9]*$/ + YOUTUBE_RE = /^http:\/\/(www\.youtube|youtube)\.com\/watch\?v=[^&]*(&.*){0,}$/ def self.included(base) base.extend ClassMethods end - module ClassMethods - def acts_as_video_fu + module ClassMethods + def acts_as_video_fu include Mdarby::Acts::Acts_as_video_fu::InstanceMethods - extend Mdarby::Acts::Acts_as_video_fu::SingletonMethods - + extend Mdarby::Acts::Acts_as_video_fu::SingletonMethods + before_save :validate end end @@ -22,33 +22,33 @@ module Mdarby end module InstanceMethods - + def type return YouTube if youtube? return Vimeo if vimeo? return false end - + def youtube? YOUTUBE_RE =~ video_url end - + def vimeo? VIMEO_RE =~ video_url end - - + + private - + def validate raise "#{self.class.to_s}#video_url doesn't exist!" unless respond_to?(:video_url) - + unless video_url.blank? errors.add_to_base("Video URL has whitespace") if video_url.strip! errors.add_to_base("Video URL is not recognized") unless type end end - + end end end lib/acts_as_video_fu.rb fefc8f4694a2981d32de8654c5c2697ece492474 Matt Darby matt@matt-darby.com http://github.com/mdarby/acts_as_video_fu/commit/e34f6718b0616588ea775deb4ec477a9ca31b47f e34f6718b0616588ea775deb4ec477a9ca31b47f 2009-03-15T08:11:12-07:00 2009-03-15T08:11:12-07:00 Updated YouTube RegExp to allow "feature" param 968b0b9c923e32030ef5c6d4a1a9104af2ae2193 Matt Darby matt@matt-darby.com