embedda 0.0.3 → 0.0.4

data/.gitignore

@@ -11,6 +11,7 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+Gemfile.lock
 
 # YARD artifacts
 .yardoc

data/README.md

@@ -38,6 +38,13 @@ This is the default behavoir:
 ```ruby
 [2] pry(main)> "String heheh http://www.youtube.com/watch?v=BVtYSy83XXw yeah".embedda(:filters => [:youtube, :vimeo])
 => "String heheh <iframe width=\"560\" height=\"315\" src=\"http://www.youtube.com/embed/BVtYSy83XXw\" frameborder=\"0\" allowfullscreen></iframe> yeah"
+```
+
+  You can enforce https URLs (useful on SSL-secured sites):
+
+```ruby
+[2] pry(main)> "String heheh http://www.youtube.com/watch?v=BVtYSy83XXw yeah".embedda(ssl: true)
+=> "String heheh <iframe width=\"560\" height=\"315\" src=\"https://www.youtube.com/embed/BVtYSy83XXw\" frameborder=\"0\" allowfullscreen></iframe> yeah"
 ```
 
 ## Supported embeds
@@ -50,4 +57,4 @@ Currently embedda can embed the following formats:
 
 ## Links
 
-Rubygems: https://rubygems.org/gems/embedda
+Rubygems: https://rubygems.org/gems/embedda

data/embedda.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |gem|
   gem.name        = "embedda"
-  gem.version     = '0.0.3'
+  gem.version     = '0.0.4'
   gem.authors     = ["Kasper Grubbe",'Christian Takle']
   gem.email       = ["kaspergrubbe@gmail.com"]
   gem.homepage    = "http://github.com/kaspergrubbe/embedda"

data/lib/embedda.rb

@@ -1,49 +1,59 @@
 require 'cgi'
 
-class String
-  def embedda(options = {})
-    options = {:filters => [:youtube, :vimeo, :soundcloud]}.merge(options)
-
-    # Make sure that filters is an array because we allow the short form of
-    # "hello".embedda(:filters => :youtube) instead of "hello".embedda(:filters => [:youtube])
-    options[:filters] = Array(options[:filters])
+class Embedda
+  class UnknownFilter < StandardError
+    def initialize(name)
+      super "Unknown filter #{name}"
+    end
+  end
 
-    compiled = self
-    compiled = youtube_replace(compiled)    if options[:filters].include?(:youtube)
-    compiled = vimeo_replace(compiled)      if options[:filters].include?(:vimeo)
-    compiled = soundcloud_replace(compiled) if options[:filters].include?(:soundcloud)
+  def initialize(string, options = {})
+    options  = {:filters => [:youtube, :vimeo, :soundcloud]}.merge(options)
+    @filters = Array(options[:filters])
+    @protocol = options[:ssl] ? 'https' : 'http'
+    @string  = string
+  end
 
-    return compiled
+  def embed
+    return "" if @string.to_s.empty?
+    @filters.each do |filter_name|
+      begin
+        @string = send("#{filter_name}_replace", @string)
+      rescue NoMethodError
+        raise UnknownFilter.new(filter_name)
+      end
+    end
+    @string
   end
 
- private
+  private
+
   def youtube_replace(compiled)
-    compiled.gsub!(/<a[^>]*?youtube\.com\/watch\?v=([a-zA-Z0-9\-\_]+).*?<\/a>/i, youtube_player("\\1"))
-    compiled.gsub!(/[http|https]+:\/\/(?:www\.)?youtube\.com\/watch\?v=([a-zA-Z0-9\-\_]+)\w*/i, youtube_player("\\1"))
+    compiled.gsub!(/(<a[^>]*?youtube\.com\/watch\?v=([a-zA-Z0-9\-\_]+).*?<\/a>)/i) { |m| youtube_player($2) }
+    compiled.gsub!(/([http|https]+:\/\/(?:www\.)?youtube\.com\/watch\?v=([a-zA-Z0-9\-\_]+)\w*)/i) { |m| youtube_player($2) }
 
     return compiled
   end
   def youtube_player(token)
-    "<iframe width=\"560\" height=\"315\" src=\"http://www.youtube.com/embed/#{token}\" frameborder=\"0\" allowfullscreen></iframe>"
+    "<iframe width=\"560\" height=\"315\" src=\"#{@protocol}://www.youtube.com/embed/#{token}\" frameborder=\"0\" allowfullscreen></iframe>"
   end
 
   def vimeo_replace(compiled)
-    compiled.gsub!(/<a[^>]*?vimeo\.com\/(\d+).*?<\/a>/i, vimeo_player("\\1"))
-    compiled.gsub!(/[http|https]+:\/\/(?:www\.)?vimeo\.com\/(\d+)\w*/i, vimeo_player("\\1"))
+    compiled.gsub!(/(<a[^>]*?vimeo\.com\/(\d+).*?<\/a>)/i) { |m| vimeo_player($2) }
+    compiled.gsub!(/([http|https]+:\/\/(?:www\.)?vimeo\.com\/(\d+)\w*)/i) { |m| vimeo_player($2) }
 
     return compiled
   end
   def vimeo_player(token)
-    "<iframe src=\"http://player.vimeo.com/video/#{token}\" width=\"500\" height=\"281\" frameborder=\"0\" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>"
+    "<iframe src=\"#{@protocol}://player.vimeo.com/video/#{token}\" width=\"500\" height=\"281\" frameborder=\"0\" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>"
   end
 
   def soundcloud_replace(compiled)
     r = /(https?:\/\/(?:www.)?soundcloud.com\/[A-Za-z0-9]+(?:[-_][A-Za-z0-9]+)*(?!\/sets(?:\/|$))(?:\/[A-Za-z0-9]+(?:[-_][A-Za-z0-9]+)*){1,2}\/?)/i
-    compiled.gsub!(r) { |match| soundcloud_player(match) }
+    compiled.gsub!(r) { |m| soundcloud_player(m) }
 
     return compiled
   end
-
   def soundcloud_player(token)
     url_encoded_string = CGI::escape(token)
 

data/lib/embedda/core_ext.rb

@@ -0,0 +1,7 @@
+require 'embedda'
+
+class String
+  def embedda(options = {})
+    Embedda.new(self, options).embed
+  end
+end

data/spec/embedda_core_ext_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+require 'embedda/core_ext'
+
+describe String do
+  it 'should have #embedda method' do
+    expect(described_class.new).to respond_to(:embedda)
+  end
+
+  context '#embedda' do
+    let(:embed_string) { '<iframe width="560" height="315" src="http://www.youtube.com/embed/dQw4w9WgXcQ" frameborder="0" allowfullscreen></iframe>' }
+    let(:media_link)   { 'http://www.youtube.com/watch?v=dQw4w9WgXcQ' }
+
+    it 'should embed media' do
+      expect(media_link.embedda).to eq(embed_string)
+    end
+  end
+end
+

data/spec/embedda_spec.rb

@@ -1,113 +1,172 @@
 require "spec_helper"
-require 'embedda'
+require "embedda"
+
+describe Embedda do
+  let(:embedda) { described_class.new(@story).embed }
 
-describe "Embedda" do
   context "Youtube-link" do
-    before(:all) do
-      @embed_string = '<iframe width="560" height="315" src="http://www.youtube.com/embed/dQw4w9WgXcQ" frameborder="0" allowfullscreen></iframe>'
-    end
+    let(:embed_string) { '<iframe width="560" height="315" src="http://www.youtube.com/embed/dQw4w9WgXcQ" frameborder="0" allowfullscreen></iframe>' }
+    let(:https_embed_string) { '<iframe width="560" height="315" src="https://www.youtube.com/embed/dQw4w9WgXcQ" frameborder="0" allowfullscreen></iframe>' }
 
     it "should embed when text have a link" do
-      story = "http://www.youtube.com/watch?v=dQw4w9WgXcQ".embedda
-      expect(story).to eq(@embed_string)
+      @story = "http://www.youtube.com/watch?v=dQw4w9WgXcQ"
+      expect(embedda).to eq(embed_string)
     end
 
     it "should embed when text have a link with feature_embed" do
-      story = "http://www.youtube.com/watch?feature=player_embedded&v=dQw4w9WgXcQ".embedda
-#      expect(story).to eq(@embed_string)
+      @story = "http://www.youtube.com/watch?feature=player_embedded&v=dQw4w9WgXcQ"
+      pending
+      expect(embedda).to eq(embed_string)
     end
 
     it "should embed when also other text is present around link" do
-      story = "Hello, my name is Kasper: http://www.youtube.com/watch?v=dQw4w9WgXcQ<br/>And I am embedding links".embedda
-      expect(story).to eq("Hello, my name is Kasper: #{@embed_string}<br/>And I am embedding links")
+      @story = 'Hello, my name is Kasper: http://www.youtube.com/watch?v=dQw4w9WgXcQ<br/>And I am embedding links'
+      expect(embedda).to eq("Hello, my name is Kasper: #{embed_string}<br/>And I am embedding links")
     end
 
     it "should embed when text include anchor tag to Youtube" do
-      story = "<a href=\"http://www.youtube.com/watch?v=dQw4w9WgXcQ\">Look here for HalfLife3!</a>".embedda
-      expect(story).to eq(@embed_string)
+      @story = '<a href="http://www.youtube.com/watch?v=dQw4w9WgXcQ">Look here for HalfLife3!</a>'
+      expect(embedda).to eq(embed_string)
     end
 
     it "should embed when also other text is present around anchor tag" do
-      story = "Hello, my name is Kasper: <b><a href=\"http://www.youtube.com/watch?v=dQw4w9WgXcQ\">Look here for HalfLife3!</a><br/></b>And I am embedding links".embedda
-      expect(story).to eq("Hello, my name is Kasper: <b>#{@embed_string}<br/></b>And I am embedding links")
+      @story = 'Hello, my name is Kasper: <b><a href="http://www.youtube.com/watch?v=dQw4w9WgXcQ">Look here for HalfLife3!</a><br/></b>And I am embedding links'
+      expect(embedda).to eq("Hello, my name is Kasper: <b>#{embed_string}<br/></b>And I am embedding links")
     end
 
     it "should embed when content is around the link" do
-      story = "\n\nMy suggestions for getting ready for the dreadful monday we all hate:\n\nhttp://www.youtube.com/watch?v=dQw4w9WgXcQ\n\n".embedda
-      expect(story).to eq("\n\nMy suggestions for getting ready for the dreadful monday we all hate:\n\n#{@embed_string}\n\n")
+      @story = "\n\nMy suggestions for getting ready for the dreadful monday we all hate:\n\nhttp://www.youtube.com/watch?v=dQw4w9WgXcQ\n\n"
+      expect(embedda).to eq("\n\nMy suggestions for getting ready for the dreadful monday we all hate:\n\n#{embed_string}\n\n")
     end
 
     it "should embed when enabled" do
-      story = "Hello, my name is Kasper: <b><a href=\"http://www.youtube.com/watch?v=dQw4w9WgXcQ\">Look here for HalfLife3!</a><br/></b>And I am embedding links".embedda(:filters => :youtube)
-      expect(story).to eq("Hello, my name is Kasper: <b>#{@embed_string}<br/></b>And I am embedding links")
+      @story  = 'Hello, my name is Kasper: <b><a href="http://www.youtube.com/watch?v=dQw4w9WgXcQ">Look here for HalfLife3!</a><br/></b>And I am embedding links'
+      embedda = described_class.new(@story, :filters => :youtube).embed
+      expect(embedda).to eq("Hello, my name is Kasper: <b>#{embed_string}<br/></b>And I am embedding links")
     end
 
     it "should not embed when disabled" do
-      story = "Hello, my name is Kasper: <b><a href=\"http://www.youtube.com/watch?v=dQw4w9WgXcQ\">Look here for HalfLife3!</a><br/></b>And I am embedding links".embedda(:filters => :vimeo)
-      expect(story).to eq("Hello, my name is Kasper: <b><a href=\"http://www.youtube.com/watch?v=dQw4w9WgXcQ\">Look here for HalfLife3!</a><br/></b>And I am embedding links")
+      @story = 'Hello, my name is Kasper: <b><a href="http://www.youtube.com/watch?v=dQw4w9WgXcQ">Look here for HalfLife3!</a><br/></b>And I am embedding links'
+      embedda = described_class.new(@story, :filters => :vimeo).embed
+      expect(embedda).to eq('Hello, my name is Kasper: <b><a href="http://www.youtube.com/watch?v=dQw4w9WgXcQ">Look here for HalfLife3!</a><br/></b>And I am embedding links')
+    end
+
+    it 'should output a https link if ssl option is given' do
+      @story = "http://www.youtube.com/watch?v=dQw4w9WgXcQ"
+      expect(described_class.new(@story, :ssl => true).embed).to eq(https_embed_string)
     end
   end
 
   context "Vimeo-link" do
-    before(:all) do
-      @embed_string = "<iframe src=\"http://player.vimeo.com/video/20241459\" width=\"500\" height=\"281\" frameborder=\"0\" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>"
-    end
+    let(:embed_string) { '<iframe src="http://player.vimeo.com/video/20241459" width="500" height="281" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>' }
+    let(:https_embed_string) { '<iframe src="https://player.vimeo.com/video/20241459" width="500" height="281" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>' }
 
     it "should embed when text have a link" do
-      story = "http://vimeo.com/20241459".embedda
-      expect(story).to eq(@embed_string)
+      @story = "http://vimeo.com/20241459"
+      expect(embedda).to eq(embed_string)
     end
 
     it "should embed when also other text is present around link" do
-      story = "Hello, my name is Kasper: http://vimeo.com/20241459<br/>And I am embedding links".embedda
-      expect(story).to eq("Hello, my name is Kasper: #{@embed_string}<br/>And I am embedding links")
+      @story = 'Hello, my name is Kasper: http://vimeo.com/20241459<br/>And I am embedding links'
+      expect(embedda).to eq("Hello, my name is Kasper: #{embed_string}<br/>And I am embedding links")
     end
 
     it "should embed when text include anchor tag to Vimeo" do
-      story = "<a href=\"http://vimeo.com/20241459\">Look here for HalfLife3!</a>".embedda
-      expect(story).to eq(@embed_string)
+      @story = '<a href="http://vimeo.com/20241459">Look here for HalfLife3!</a>'
+      expect(embedda).to eq(embed_string)
     end
 
     it "should embed when also other text is present around anchor tag" do
-      story = "Hello, my name is Kasper: <a href=\"http://vimeo.com/20241459\">Look here for HalfLife3!</a><br/>And I am embedding links".embedda
-      expect(story).to eq("Hello, my name is Kasper: #{@embed_string}<br/>And I am embedding links")
+      @story = 'Hello, my name is Kasper: <a href="http://vimeo.com/20241459">Look here for HalfLife3!</a><br/>And I am embedding links'
+      expect(embedda).to eq("Hello, my name is Kasper: #{embed_string}<br/>And I am embedding links")
     end
 
     it "should embed when enabled" do
-      story = "Hello, my name is Kasper: <a href=\"http://vimeo.com/20241459\">Look here for HalfLife3!</a><br/>And I am embedding links".embedda(:filters => :vimeo)
-      expect(story).to eq("Hello, my name is Kasper: #{@embed_string}<br/>And I am embedding links")
+      @story  = 'Hello, my name is Kasper: <a href="http://vimeo.com/20241459">Look here for HalfLife3!</a><br/>And I am embedding links'
+      embedda = described_class.new(@story, :filters => :vimeo).embed
+      expect(embedda).to eq("Hello, my name is Kasper: #{embed_string}<br/>And I am embedding links")
     end
 
     it "should not embed when disabled" do
-      story = "Hello, my name is Kasper: <a href=\"http://vimeo.com/20241459\">Look here for HalfLife3!</a><br/>And I am embedding links".embedda(:filters => :youtube)
-      expect(story).to eq("Hello, my name is Kasper: <a href=\"http://vimeo.com/20241459\">Look here for HalfLife3!</a><br/>And I am embedding links")
+      @story  = 'Hello, my name is Kasper: <a href="http://vimeo.com/20241459">Look here for HalfLife3!</a><br/>And I am embedding links'
+      embedda = described_class.new(@story, :filters => :youtube).embed
+      expect(embedda).to eq('Hello, my name is Kasper: <a href="http://vimeo.com/20241459">Look here for HalfLife3!</a><br/>And I am embedding links')
+    end
+
+    it 'should output a https link if ssl option is given' do
+      @story = "http://vimeo.com/20241459"
+      expect(described_class.new(@story, :ssl => true).embed).to eq(https_embed_string)
     end
   end
 
   context "Soundcloud-link" do
-    before(:all) do
-      @embed_string = "<iframe width=\"100%\" height=\"166\" scrolling=\"no\" frameborder=\"no\" src=\"https://w.soundcloud.com/player/?url=https%3A%2F%2Fsoundcloud.com%2Fflume-1%2Fflume-left-alone-bobby-tank&color=ff6600&amp;auto_play=false&amp;show_artwork=false\"></iframe>"
-      @link         = "https://soundcloud.com/flume-1/flume-left-alone-bobby-tank"
-    end
+    let(:embed_string) { '<iframe width="100%" height="166" scrolling="no" frameborder="no" src="https://w.soundcloud.com/player/?url=https%3A%2F%2Fsoundcloud.com%2Fflume-1%2Fflume-left-alone-bobby-tank&color=ff6600&amp;auto_play=false&amp;show_artwork=false"></iframe>' }
+    let(:link)         { 'https://soundcloud.com/flume-1/flume-left-alone-bobby-tank' }
 
     it "should embed when text have a link" do
-      story = @link.embedda
-      expect(story).to eq(@embed_string)
+      @story = link
+      expect(embedda).to eq(embed_string)
     end
 
     it "should embed when also other text is present around link" do
-      story = "Hello, my name is Takle: #{@link}<br/>And I am embedding links".embedda
-      expect(story).to eq("Hello, my name is Takle: #{@embed_string}<br/>And I am embedding links")
+      @story = "Hello, my name is Takle: #{link}<br/>And I am embedding links"
+      expect(embedda).to eq("Hello, my name is Takle: #{embed_string}<br/>And I am embedding links")
     end
 
     it "should embed when enabled" do
-      story = "Hello, my name is Takle: #{@link}<br/>And I am embedding links".embedda(:filters => :soundcloud)
-      expect(story).to eq("Hello, my name is Takle: #{@embed_string}<br/>And I am embedding links")
+      @story  = "Hello, my name is Takle: #{link}<br/>And I am embedding links"
+      embedda = described_class.new(@story, :filters => :soundcloud).embed
+      expect(embedda).to eq("Hello, my name is Takle: #{embed_string}<br/>And I am embedding links")
     end
 
     it "should not embed when disabled" do
-      story = "Hello, my name is Takle: #{@link}<br/>And I am not embedding links".embedda(:filters => :youtube)
-      expect(story).to eq("Hello, my name is Takle: #{@link}<br/>And I am not embedding links")
+      @story  = "Hello, my name is Takle: #{link}<br/>And I am not embedding links"
+      embedda = described_class.new(@story, :filters => :youtube).embed
+      expect(embedda).to eq("Hello, my name is Takle: #{link}<br/>And I am not embedding links")
     end
   end
+
+  context "All embeds in one string" do
+      let(:youtube)         { '<iframe width="560" height="315" src="http://www.youtube.com/embed/dQw4w9WgXcQ" frameborder="0" allowfullscreen></iframe>' }
+      let(:youtube_link)    { 'http://www.youtube.com/watch?v=dQw4w9WgXcQ' }
+      let(:vimeo)           { '<iframe src="http://player.vimeo.com/video/20241459" width="500" height="281" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>' }
+      let(:vimeo_link)      { 'http://vimeo.com/20241459' }
+      let(:soundcloud)      { '<iframe width="100%" height="166" scrolling="no" frameborder="no" src="https://w.soundcloud.com/player/?url=https%3A%2F%2Fsoundcloud.com%2Fflume-1%2Fflume-left-alone-bobby-tank&color=ff6600&amp;auto_play=false&amp;show_artwork=false"></iframe>' }
+      let(:soundcloud_link) { 'https://soundcloud.com/flume-1/flume-left-alone-bobby-tank' }
+
+    it "should show two youtube embeds" do
+      @story = "#{youtube_link} #{youtube_link}"
+      expect(embedda).to eq("#{youtube} #{youtube}")
+    end
+
+    it "should show two vimeo embeds" do
+      @story = "#{vimeo_link} #{vimeo_link}"
+      expect(embedda).to eq("#{vimeo} #{vimeo}")
+    end
+
+    it "should show two soundcloud embeds" do
+      @story = "#{soundcloud_link} #{soundcloud_link}"
+      expect(embedda).to eq("#{soundcloud} #{soundcloud}")
+    end
+
+    it "should show all the embeds in the @story" do
+      @story = "#{youtube_link} #{vimeo_link} #{soundcloud_link}"
+      expect(embedda).to eq("#{youtube} #{vimeo} #{soundcloud}")
+    end
+  end
+
+  context "Unkown filter" do
+    it "should refuse to embed when unknown filter passed" do
+      story = "http://www.youtube.com/watch?v=dQw4w9WgXcQ"
+      expect { described_class.new(story, :filters => [:dummy]).embed }.to raise_error(Embedda::UnknownFilter)
+    end
+  end
+
+  context "Empty string" do
+    it "should return empty string" do
+      @story = ""
+      expect(embedda).to eq("")
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: embedda
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-09 00:00:00.000000000 Z
+date: 2013-08-06 00:00:00.000000000 Z
 dependencies: []
 description: Embed content strings in your strings, and turn it to embed HTML!
 email:
@@ -28,6 +28,8 @@ files:
 - Rakefile.rb
 - embedda.gemspec
 - lib/embedda.rb
+- lib/embedda/core_ext.rb
+- spec/embedda_core_ext_spec.rb
 - spec/embedda_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/kaspergrubbe/embedda
@@ -55,5 +57,7 @@ signing_key:
 specification_version: 3
 summary: Embed content strings in your strings, and turn it to embed HTML!
 test_files:
+- spec/embedda_core_ext_spec.rb
 - spec/embedda_spec.rb
 - spec/spec_helper.rb
+has_rdoc: