embedda 0.0.1 → 0.0.2

data/.travis.yml

@@ -3,7 +3,6 @@ rvm:
   - 2.0.0
   - 1.9.3
   - 1.9.2
-  - 1.9.1
   - jruby-18mode # JRuby in 1.8 mode
   - jruby-19mode # JRuby in 1.9 mode
   - rbx-18mode

data/README.md

@@ -6,3 +6,26 @@ Easily embed content in a string from Youtube or Vimeo by writing a simple strin
 ## Tests:
 
 [![Build Status](https://travis-ci.org/kaspergrubbe/embedda.png)](https://travis-ci.org/kaspergrubbe/embedda)
+
+## Install
+
+Add this to your `Gemfile`:
+
+```ruby
+gem 'embedda'
+```
+
+And remember to `bundle`
+
+## Usage
+
+This gem adds `String#embedda` to Ruby strings. You use it like this:
+
+```ruby
+[2] pry(main)> "String heheh http://www.youtube.com/watch?v=BVtYSy83XXw yeah".embedda
+=> "String heheh <iframe width=\"560\" height=\"315\" src=\"http://www.youtube.com/embed/BVtYSy83XXw\" frameborder=\"0\" allowfullscreen></iframe> yeah"
+```
+
+## Links
+
+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.1'
+  gem.version     = '0.0.2'
   gem.authors     = ["Kasper Grubbe"]
   gem.email       = ["kaspergrubbe@gmail.com"]
   gem.homepage    = "http://github.com/kaspergrubbe/embedda"

data/lib/embedda.rb

@@ -9,7 +9,7 @@ class String
  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 @@ class String
 
   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

data/spec/embedda_spec.rb

@@ -12,9 +12,14 @@ describe "Embedda" do
       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 @@ describe "Embedda" do
     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 @@ describe "Embedda" do
     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 @@ describe "Embedda" do
     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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: embedda
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors: