embed 0.0.2 → 0.0.3

data/README.md

@@ -2,7 +2,7 @@
 
 An easy way to embed media to your Rails app. Don't worry about messy embedding HTML anymore, just use the media URL.
 
-As of now, it only supports YouTube and Vimeo.
+As of now, it only supports YouTube, Vimeo and SoundCloud.
 
 ## Installation
 
@@ -22,7 +22,7 @@ Or install it yourself as:
 
 On your view:
 ```ruby
-<%= embed(http://www.youtube.com/watch?v=\"fwncgZ15RVQ\")" %>
+<%= embed("http://www.youtube.com/watch?v=fwncgZ15RVQ") %>
 ```
 
 ## Contributing

data/lib/embed/version.rb

@@ -1,3 +1,3 @@
 module Embed
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/embed_helper.rb

@@ -1,22 +1,40 @@
 require 'embed'
+require 'json'
+require 'net/http'
+require 'uri'
+require 'cgi'
 
 module Embed
 	module EmbedHelper
 		def youtube_embed(url)
 			video_id = Embed.youtube_video_id(url)
-			url = %Q{<iframe id="#{video_id}" type="text/html" width="640" height="390" src="http://www.youtube.com/embed/#{video_id}?autoplay=0 frameborder="0"/>}
-			url.respond_to?(:html_safe) ? url.html_safe : url
+			html = %Q{<iframe id="#{video_id}" type="text/html" width="640" height="390" src="http://www.youtube.com/embed/#{video_id}?autoplay=0 frameborder="0"/>}
+			html.respond_to?(:html_safe) ? html.html_safe : html
 		end
 		def vimeo_embed(url)
 			video_id = Embed.vimeo_video_id(url)
-			url = %Q{<iframe src="http://player.vimeo.com/video/#{video_id}" width="640" height="390" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>}
-			url.respond_to?(:html_safe) ? url.html_safe : url
+			html = %Q{<iframe src="http://player.vimeo.com/video/#{video_id}" width="640" height="390" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>}
+			html.respond_to?(:html_safe) ? html.html_safe : html
+		end
+		def soundcloud_embed(url)
+			uri = URI("http://soundcloud.com/oembed")
+			params = {:format => 'json', :url => url}
+			uri.query = params.collect { |k,v| "#{k}=#{CGI::escape(v.to_s)}" }.join('&')
+			response = Net::HTTP.get(uri)
+			if response
+				html = JSON.parse(response)["html"]
+				html.respond_to?(:html_safe) ? html.html_safe : html
+			else
+				return link_to(url)
+			end
 		end
 		def embed(url)
 			if url[/(youtube.com|youtu.be)/]
 				return youtube_embed(url)
 			elsif url[/vimeo.com/]
 				return vimeo_embed(url)
+			elsif url[/soundcloud.com/]
+				return soundcloud_embed(url)
 			end
 		end
 	end

data/lib/spec/embed_helper_spec.rb

@@ -7,6 +7,7 @@ include Embed::EmbedHelper
 describe Embed::EmbedHelper do
 	let(:youtube_url) { 'http://www.youtube.com/watch?v=u1zgFlCw8Aw' }
 	let(:vimeo_url)   { 'http://vimeo.com/49760839' }
+	let(:soundcloud_url) { 'http://soundcloud.com/dj-slink/in-for-the-kill-dj-slinks-gets' }
 	describe '::youtube_embed(url)' do
 		it 'returns the embedding html for a YouTube URL' do
 			youtube_embed(youtube_url).should == %Q{<iframe id="u1zgFlCw8Aw" type="text/html" width="640" height="390" src="http://www.youtube.com/embed/u1zgFlCw8Aw?autoplay=0 frameborder="0"/>}
@@ -17,6 +18,11 @@ describe Embed::EmbedHelper do
 			vimeo_embed(vimeo_url).should == %Q{<iframe src="http://player.vimeo.com/video/49760839" width="640" height="390" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>}
 		end
 	end
+	describe '::soundcloud_embed(url)' do
+		it 'returns the embedding html for a SoundCloud URL' do
+			soundcloud_embed(soundcloud_url).should == %Q{<iframe width="100%" height="166" scrolling="no" frameborder="no" src="http://w.soundcloud.com/player/?url=http%3A%2F%2Fapi.soundcloud.com%2Ftracks%2F60522748&show_artwork=true"></iframe>}
+		end
+	end
 	describe '::embed(url)' do
 		it 'embeds an YouTube video' do
 			embed(youtube_url).should == %Q{<iframe id="u1zgFlCw8Aw" type="text/html" width="640" height="390" src="http://www.youtube.com/embed/u1zgFlCw8Aw?autoplay=0 frameborder="0"/>}
@@ -24,5 +30,8 @@ describe Embed::EmbedHelper do
 		it 'embeds a Vimeo video' do
 			embed(vimeo_url).should == %Q{<iframe src="http://player.vimeo.com/video/49760839" width="640" height="390" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>}
 		end
+		it 'embeds a SoundCloud audio' do
+			embed(soundcloud_url).should == %Q{<iframe width="100%" height="166" scrolling="no" frameborder="no" src="http://w.soundcloud.com/player/?url=http%3A%2F%2Fapi.soundcloud.com%2Ftracks%2F60522748&show_artwork=true"></iframe>}
+		end
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: embed
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -75,7 +75,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3195176760563316961
+      hash: -1582312353035851371
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -84,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3195176760563316961
+      hash: -1582312353035851371
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24