embedda 0.0.2 → 0.0.3

data/.ruby-version

@@ -1 +1 @@
-1.9.3-p385
+1.9.3-p392

data/README.md

@@ -26,6 +26,28 @@ This gem adds `String#embedda` to Ruby strings. You use it like this:
 => "String heheh <iframe width=\"560\" height=\"315\" src=\"http://www.youtube.com/embed/BVtYSy83XXw\" frameborder=\"0\" allowfullscreen></iframe> yeah"
 ```
 
+If you need only one of the parsers you can do like this:
+
+```ruby
+[2] pry(main)> "String heheh http://www.youtube.com/watch?v=BVtYSy83XXw yeah".embedda(:filters => :youtube)
+=> "String heheh <iframe width=\"560\" height=\"315\" src=\"http://www.youtube.com/embed/BVtYSy83XXw\" frameborder=\"0\" allowfullscreen></iframe> yeah"
+```
+
+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"
+```
+
+## Supported embeds
+
+Currently embedda can embed the following formats:
+
+* Youtube
+* Vimeo
+* Soundcloud
+
 ## Links
 
 Rubygems: https://rubygems.org/gems/embedda

data/embedda.gemspec

@@ -3,8 +3,8 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |gem|
   gem.name        = "embedda"
-  gem.version     = '0.0.2'
-  gem.authors     = ["Kasper Grubbe"]
+  gem.version     = '0.0.3'
+  gem.authors     = ["Kasper Grubbe",'Christian Takle']
   gem.email       = ["kaspergrubbe@gmail.com"]
   gem.homepage    = "http://github.com/kaspergrubbe/embedda"
   gem.summary     = %q{Embed content strings in your strings, and turn it to embed HTML!}

data/lib/embedda.rb

@@ -1,7 +1,17 @@
+require 'cgi'
+
 class String
-  def embedda
-    compiled = youtube_replace(self)
-    compiled = vimeo_replace(compiled)
+  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])
+
+    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)
 
     return compiled
   end
@@ -26,4 +36,18 @@ class String
   def vimeo_player(token)
     "<iframe src=\"http://player.vimeo.com/video/#{token}\" width=\"500\" height=\"281\" frameborder=\"0\" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>"
   end
-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) }
+
+    return compiled
+  end
+
+  def soundcloud_player(token)
+    url_encoded_string = CGI::escape(token)
+
+    # Note: added '&' ...?url=...&
+    "<iframe width=\"100%\" height=\"166\" scrolling=\"no\" frameborder=\"no\" src=\"https://w.soundcloud.com/player/?url=#{url_encoded_string}&color=ff6600&amp;auto_play=false&amp;show_artwork=false\"></iframe>"
+  end
+end

data/spec/embedda_spec.rb

@@ -36,6 +36,16 @@ describe "Embedda" 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")
     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")
+    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")
+    end
   end
 
   context "Vimeo-link" do
@@ -53,7 +63,7 @@ describe "Embedda" do
       expect(story).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
+    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)
     end
@@ -62,5 +72,42 @@ describe "Embedda" 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")
     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")
+    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")
+    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
+
+    it "should embed when text have a link" do
+      story = @link.embedda
+      expect(story).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")
+    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")
+    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")
+    end
   end
-end
+end

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: embedda
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
 - Kasper Grubbe
+- Christian Takle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-17 00:00:00.000000000 Z
+date: 2013-04-09 00:00:00.000000000 Z
 dependencies: []
 description: Embed content strings in your strings, and turn it to embed HTML!
 email: