video_embed 0.0.1 → 0.0.2

data/lib/video_embed/version.rb

@@ -1,3 +1,3 @@
 class VideoEmbed
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/video_embed/vimeo.rb

@@ -25,7 +25,7 @@ class VideoEmbed
       private
       
       def video_id
-        url.to_s.match(/vimeo.com\/(\d*)\??/)[1]
+        url.to_s.match(/vimeo.com(?:\/m)?\/(\d*)\??/)[1]
       end
     end
   end

data/lib/video_embed/youtube.rb

@@ -3,7 +3,7 @@ require 'cgi'
 class VideoEmbed
   class YouTube
     def url?(url)
-      url.host =~ /youtube\.com/
+      url.host =~ /(:?youtube\.com|youtu.be)/
     end
 
     def embed(url, options = {})
@@ -27,8 +27,16 @@ class VideoEmbed
       private
       
       def video_id
-        params = CGI.parse(url.query)
-        params['v'].first
+        if short_url?
+          url.path.match(/\/(.*)\??/)[1]
+        else
+          params = CGI.parse(url.query)
+          params['v'].first
+        end
+      end
+
+      def short_url?
+        url.host == 'youtu.be'
       end
     end
   end

data/spec/video_embed_spec.rb

@@ -7,6 +7,11 @@ describe VideoEmbed do
       video_embed.should eql(%Q{<iframe width="560" height="315" src="http://www.youtube.com/embed/4Z3r9X8OahA?rel=0" frameborder="0" allowfullscreen></iframe>})
     end
 
+    it 'returns embed html from a short url' do
+      video_embed = VideoEmbed.embed('http://youtu.be/4Z3r9X8OahA')
+      video_embed.should include('http://www.youtube.com/embed/4Z3r9X8OahA?rel=0')
+    end
+
     it 'accepts a custom width' do
       video_embed = VideoEmbed.embed('http://www.youtube.com/watch?v=NtgtMQwr3Ko', :width => 1280)
       video_embed.should match(/width="1280"/) 
@@ -24,6 +29,11 @@ describe VideoEmbed do
       video_embed.should eql(%Q{<iframe src="http://player.vimeo.com/video/11040425?title=0&amp;byline=0&amp;portrait=0" width="560" height="315" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>})
     end
 
+    it 'returns embed html from a mobile url' do
+      video_embed = VideoEmbed.embed('http://vimeo.com/m/11040425')
+      video_embed.should include('http://player.vimeo.com/video/11040425?title=0&amp;byline=0&amp;portrait=0')
+    end
+
     it 'accepts a custom width' do
       video_embed = VideoEmbed.embed('http://vimeo.com/11040425', :width => 720)
       video_embed.should match(/width="720"/) 

metadata

@@ -2,7 +2,7 @@
 name: video_embed
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Lee Jones