Merge branch 'master' of github.com:kaspergrubbe/embedda

lib/embedda.rb

@@ -9,7 +9,7 @@ def embedda
  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\-\_]+)\S*/i, youtube_player("\\1"))
+    compiled.gsub!(/[http|https]+:\/\/(?:www\.)?youtube\.com\/watch\?v=([a-zA-Z0-9\-\_]+)\w*/i, youtube_player("\\1"))
 
     return compiled
   end
@@ -19,7 +19,7 @@ def youtube_player(token)
 
   def vimeo_replace(compiled)
     compiled.gsub!(/<a[^>]*?vimeo\.com\/(\d+).*?<\/a>/i, vimeo_player("\\1"))
-    compiled.gsub!(/[http|https]+:\/\/(?:www\.)?vimeo\.com\/(\d+)\S*/i, vimeo_player("\\1"))
+    compiled.gsub!(/[http|https]+:\/\/(?:www\.)?vimeo\.com\/(\d+)\w*/i, vimeo_player("\\1"))
 
     return compiled
   end

spec/embedda_spec.rb

@@ -12,9 +12,14 @@
       expect(story).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)
+    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".embedda
+      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
@@ -23,8 +28,13 @@
     end
 
     it "should embed when also other text is present around anchor tag" do
-      story = "Hello, my name is Kasper: <a href=\"http://www.youtube.com/watch?v=dQw4w9WgXcQ\">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: <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")
+    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")
     end
   end
 
@@ -39,8 +49,8 @@
     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".embedda
+      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
@@ -49,8 +59,8 @@
     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".embedda
+      expect(story).to eq("Hello, my name is Kasper: #{@embed_string}<br/>And I am embedding links")
     end
   end
 end