embed 0.0.5 → 0.0.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c5832fbdcd74bb22831d121cbb8e8c8e5cd3a93d
+  data.tar.gz: c95a376112cd1788632668e1daaef3a024975c1d
+SHA512:
+  metadata.gz: e4a4c4623b9d3b0ead6103cb1af400964a030265b037fc16d91481d2fbc16c1b604511131f0bc5ad3881bd104ecd923d24ef5ea3f4e8a95eb2b606f0f52ad70e
+  data.tar.gz: 480191370e99857d6ea036c3477cf7fdbe9b41906235b1618f94b71fe9597f6dbd0d9f5c76d54f6331e328fcfeb16e5609a2acbe65fc1d958dac8d9766afe4bf

data/README.md

@@ -30,6 +30,16 @@ On your view
 <%= embed('http://www.youtube.com/watch?v=fwncgZ15RVQ', {:width => 540, :height => 290}) %>
 ```
 
+Can also specify the protocol («http» by default)
+
+```ruby
+<%= embed('http://www.youtube.com/watch?v=fwncgZ15RVQ', {:width => 540, :height => 290, :protocol => 'https'}) %>
+```
+
+** Soundcloud always uses https
+** Wistia does not allow using https
+
+
 ## Contributing
 
 1. Fork it

data/lib/embed/version.rb

@@ -1,3 +1,3 @@
 module Embed
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/embed_helper.rb

@@ -6,26 +6,26 @@ require 'cgi'
 
 module Embed
   module EmbedHelper
-    def _youtube_embed(url, width, height)
+    def _youtube_embed(url, width, height, protocol)
       video_id = Embed.youtube_video_id(url)
-      html = %Q{<iframe id="#{video_id}" type="text/html" width="#{width}" height="#{height}" src="http://www.youtube.com/embed/#{video_id}?autoplay=0" frameborder="0"/>}
+      html = %Q{<iframe id="#{video_id}" type="text/html" width="#{width}" height="#{height}" src="#{protocol}://www.youtube.com/embed/#{video_id}?autoplay=0" frameborder="0"></iframe>}
       html.respond_to?(:html_safe) ? html.html_safe : html
     end
 
-    def _vimeo_embed(url, width, height)
+    def _vimeo_embed(url, width, height, protocol)
       video_id = Embed.vimeo_video_id(url)
-      html = %Q{<iframe src="http://player.vimeo.com/video/#{video_id}" width="#{width}" height="#{height}" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>}
+      html = %Q{<iframe src="#{protocol}://player.vimeo.com/video/#{video_id}" width="#{width}" height="#{height}" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>}
       html.respond_to?(:html_safe) ? html.html_safe : html
     end
 
-    def _soundcloud_embed(url)
+    def _soundcloud_embed(url, protocol)
       params = {:format => 'json', :url => url}
-      _oembed('http://soundcloud.com/oembed', url, params)
+      _oembed("#{protocol}://soundcloud.com/oembed", url, params)
     end
 
-    def _wistia_embed(url, width, height)
+    def _wistia_embed(url, width, height, protocol)
       params = { :format => 'json', :url => url, :width => width, :height => height }
-      _oembed('http://fast.wistia.com/oembed', url, params)
+      _oembed("#{protocol}://fast.wistia.com/oembed", url, params)
     end
 
     def _oembed(oembed_url, url, params)
@@ -45,16 +45,19 @@ module Embed
     end
 
     def embed(url, params = {})
+      return if url.nil? || url.empty?
+
       params[:width] ||= 640
       params[:height] ||= 390
+      params[:protocol] ||= 'http'
       if url[/(youtube.com|youtu.be)/]
-        return _youtube_embed(url, params[:width], params[:height])
+        return _youtube_embed(url, params[:width], params[:height], params[:protocol])
       elsif url[/vimeo.com/]
-        return _vimeo_embed(url, params[:width], params[:height])
+        return _vimeo_embed(url, params[:width], params[:height], params[:protocol])
       elsif url[/soundcloud.com/]
-        return _soundcloud_embed(url)
+        return _soundcloud_embed(url, params[:protocol])
       elsif url[/wistia.com/]
-        return _wistia_embed(url, params[:width], params[:height])
+        return _wistia_embed(url, params[:width], params[:height], params[:protocol])
       end
     end
   end

data/spec/embed_helper_spec.rb

@@ -10,60 +10,68 @@ describe Embed::EmbedHelper do
   let(:soundcloud_url) { 'http://soundcloud.com/forss/flickermood' }
   let(:wistia_url) { 'http://fast.wistia.com/embed/iframe/2cf8fbb2c0' }
 
-  describe '::_youtube_embed(url, 640, 390)' do
+  describe '::_youtube_embed(url, 640, 390, http)' do
     it 'returns the embedding html for a YouTube URL' do
-      _youtube_embed(youtube_url, 640, 390).should == %Q{<iframe id="u1zgFlCw8Aw" type="text/html" width="640" height="390" src="http://www.youtube.com/embed/u1zgFlCw8Aw?autoplay=0" frameborder="0"/>}
+      _youtube_embed(youtube_url, 640, 390, 'http').should == %Q{<iframe id="u1zgFlCw8Aw" type="text/html" width="640" height="390" src="http://www.youtube.com/embed/u1zgFlCw8Aw?autoplay=0" frameborder="0"></iframe>}
     end
   end
 
-  describe '::_vimeo_embed(url, 640, 390)' do
+  describe '::_vimeo_embed(url, 640, 390, http)' do
     it 'returns the embedding html for a Vimeo URL' do
-      _vimeo_embed(vimeo_url, 640, 390).should == %Q{<iframe src="http://player.vimeo.com/video/49760839" width="640" height="390" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>}
+      _vimeo_embed(vimeo_url, 640, 390, 'http').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%2F293&show_artwork=true\"></iframe>}
-    end
-  end
+  # describe '::_soundcloud_embed(url, http)' do
+  #   it 'returns the embedding html for a SoundCloud URL' do
+  #     _soundcloud_embed(soundcloud_url, 'http').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%2F293&show_artwork=true\"></iframe>}
+  #   end
+  # end
 
-  describe '::_wistia_embed(url, 640, 390)' do
+  describe '::_wistia_embed(url, 640, 390, http)' do
     it 'returns the embedding html for a Wisita URL' do
-      _wistia_embed(wistia_url, 640, 390).should == %Q{<iframe src="http://fast.wistia.net/embed/iframe/2cf8fbb2c0?version=v1&videoHeight=390&videoWidth=640" allowtransparency="true" frameborder="0" scrolling="no" class="wistia_embed" name="wistia_embed" width="640" height="390"></iframe>}
+      _wistia_embed(wistia_url, 640, 390, 'http').should == %Q{<iframe src="http://fast.wistia.net/embed/iframe/2cf8fbb2c0" allowtransparency="true" frameborder="0" scrolling="no" class="wistia_embed" name="wistia_embed" width="640" height="390"></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"/>}
+      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"></iframe>}
     end
 
     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%2F293&show_artwork=true\"></iframe>}
+    # FIXME: SoundCloud always return https (?)
+    # 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%2F293&show_artwork=true\"></iframe>}
+    # end
+
+    it 'embeds a SoundCloud audio using https protocol' do
+      embed(soundcloud_url, {:protocol => 'https'}).should == %Q{<iframe width=\"100%\" height=\"166\" scrolling=\"no\" frameborder=\"no\" src=\"https://w.soundcloud.com/player/?url=https%3A%2F%2Fapi.soundcloud.com%2Ftracks%2F293&show_artwork=true\"></iframe>}
     end
   end
 
-  describe '::embed(url, 540, 290)' do
-    it 'embeds an YouTube video with custom sizes' do
-      embed(youtube_url, {:width => 540, :height => 290}).should == %Q{<iframe id="u1zgFlCw8Aw" type="text/html" width="540" height="290" src="http://www.youtube.com/embed/u1zgFlCw8Aw?autoplay=0" frameborder="0"/>}
+  describe '::embed(url, 540, 290, https)' do
+    it 'embeds an YouTube video with custom sizes and using https protocol' do
+      embed(youtube_url, {:width => 540, :height => 290, :protocol => 'https'}).should == %Q{<iframe id="u1zgFlCw8Aw" type="text/html" width="540" height="290" src="https://www.youtube.com/embed/u1zgFlCw8Aw?autoplay=0" frameborder="0"></iframe>}
     end
 
-    it 'embeds a Vimeo video with custom sizes' do
-      embed(vimeo_url, {:width => 540, :height => 290}).should == %Q{<iframe src="http://player.vimeo.com/video/49760839" width="540" height="290" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>}
+    it 'embeds a Vimeo video with custom sizes and using https protocol' do
+      embed(vimeo_url, {:width => 540, :height => 290, :protocol => 'https'}).should == %Q{<iframe src="https://player.vimeo.com/video/49760839" width="540" height="290" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>}
     end
 
     #FIXME: Wistia always return videoHeight=360&videoWidth=640 ??
-    it 'embeds a Wistia video with custom sizes' do
-      embed(wistia_url, {:width => 540, :height => 290}).should == %Q{<iframe src="http://fast.wistia.net/embed/iframe/2cf8fbb2c0?version=v1&videoHeight=290&videoWidth=540" allowtransparency="true" frameborder="0" scrolling="no" class="wistia_embed" name="wistia_embed" width="540" height="290"></iframe>}
-    end
+    #       Wistia not return https protocol
+    # it 'embeds a Wistia video with custom sizes and using https protocol' do
+    #   embed(wistia_url, {:width => 540, :height => 290, :protocol => 'https'}).should == %Q{<iframe src="https://fast.wistia.net/embed/iframe/2cf8fbb2c0" allowtransparency="true" frameborder="0" scrolling="no" class="wistia_embed" name="wistia_embed" width="540" height="290"></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%2F293&show_artwork=true\"></iframe>}
+    it 'do nothing when no url' do
+      embed(nil).should == nil
+      embed("").should == nil
     end
+
   end
 end

metadata

@@ -1,62 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: embed
 version: !ruby/object:Gem::Version
-  version: 0.0.5
-  prerelease: 
+  version: 0.0.6
 platform: ruby
 authors:
 - Neil Carvalho
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-04 00:00:00.000000000 Z
+date: 2013-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fakeweb
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: An easy way to embed media to your Rails app
@@ -79,33 +72,26 @@ files:
 - spec/embed_spec.rb
 homepage: https://github.com/neilvilela/embed
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 488596979403717978
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 488596979403717978
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: An easy way to embed media to your Rails app
 test_files:
 - spec/embed_helper_spec.rb