conred 0.2 → 0.2.1

data/lib/conred/version.rb

@@ -1,3 +1,3 @@
 module Conred
-  VERSION = "0.2"
+  VERSION = "0.2.1"
 end

data/lib/conred/video.rb

@@ -20,11 +20,11 @@ module Conred
     end
 
     def youtube_video?
-      /^(http:\/\/)*(www\.)*(youtube.com|youtu.be)/ =~ @video_url
+      /^(http:\/\/)*(www\.)*(youtube.com|youtu.be)/ =~ @video_url ? true : false
     end
 
     def vimeo_video?
-      /^(http:\/\/)*(www\.)*(vimeo.com)/ =~ @video_url
+      /^(http:\/\/)*(www\.)*(vimeo.com)/ =~ @video_url ? true : false
     end
 
 
@@ -40,7 +40,7 @@ module Conred
       if @video_url[/youtu\.be\/([^\?]*)/]
           @youtube_id = $1
       else
-        @video_url[/(v=([A-Za-z0-9_]*))/]
+        @video_url[/(v=([A-Za-z0-9_-]*))/]
         @youtube_id = $2
       end
       youtube_file = "../views/video/youtube_iframe"

data/spec/conred_spec/video_spec.rb

@@ -2,26 +2,34 @@ require "conred"
 
 describe Conred do
   describe Conred::Video do
-    before do
 
-    end
+    let(:short_youtube_url) {Conred::Video.new("http://youtu.be/SZt5RFzqEfY")}
+    let(:short_youtube_url_with_www) {Conred::Video.new("www.youtu.be/SZt5RFzqEfY")}
+    let(:long_youtube_url_with_features) {Conred::Video.new("http://www.youtube.com/watch?NR=1&feature=endscreen&v=Lrj5Kxdzouc")}
+    let(:short_youtube_url_without_http_and_www) {Conred::Video.new("youtu.be/SZt5RFzqEfY")}
+
+    let(:vimeo_url) {Conred::Video.new("http://vimeo.com/12311233")}
+    let(:evil_vimeo) {Conred::Video.new("eeevil vimeo www.vimeo.com/12311233")}
+    let(:vimeo_without_http) {Conred::Video.new("vimeo.com/12311233")}
+    
     it "should match youtube video" do
-      Conred::Video.new("http://www.youtube.com/watch?v=SZt5RFzqEfY&feature=g-all-fbc").should be_youtube_video
-      Conred::Video.new("http://youtu.be/SZt5RFzqEfY").should be_youtube_video
-      Conred::Video.new("youtu.be/SZt5RFzqEfY").should be_youtube_video
-      Conred::Video.new("youtube.com/watch?v=SZt5RFzqEfY&feature=g-all-fbc").should be_youtube_video
-      Conred::Video.new("www.youtube.com/watch?v=SZt5RFzqEfY&feature=g-all-fbc").should be_youtube_video
-      Conred::Video.new("www.youtu.be/SZt5RFzqEfY").should be_youtube_video
-      Conred::Video.new("youtube.com/watch?v=SZt5RFzqEfY&feature=g-all-fbc").should be_youtube_video
-      Conred::Video.new("www.youtube.com/watch?v=SZt5RFzqEfY&feature=g-all-fbc").should be_youtube_video
-      Conred::Video.new("www.youtu.be/SZt5RFzqEfY").should be_youtube_video
+      short_youtube_url.should be_youtube_video
+      short_youtube_url_with_www.should be_youtube_video
+      long_youtube_url_with_features.should be_youtube_video
+      short_youtube_url_without_http_and_www.should be_youtube_video
+    end
+
+    it "should check for corner cases" do
+      evil_vimeo.should_not be_youtube_video
+      evil_vimeo.should_not be_vimeo_video
     end
+
     it "should match vimeo video" do
-      Conred::Video.new("http://vimeo.com/12311233").youtube_video? == false
-      Conred::Video.new("vimeo.com/12311233").youtube_video? == false
-      Conred::Video.new("http://www.vimeo.com/12311233http://youtube.com/12311233").youtube_video? == false
-      Conred::Video.new("eeevil vimeo www.vimeo.com/12311233").youtube_video? == false
+      vimeo_url.should_not be_youtube_video
+      vimeo_without_http.should be_vimeo_video
+      vimeo_url.should be_vimeo_video
     end  
+
     it "should return correct embed code" do
       Conred::Video.new("http://www.youtube.com/watch?NR=1&feature=endscreen&v=Lrj5Kxdzouc", 450, 300).code.should match(/Lrj5Kxdzouc/)
       Conred::Video.new("http://www.youtube.com/watch?v=Lrj5Kxdzouc", 450, 300).code.should match(/Lrj5Kxdzouc/)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conred
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-20 00:00:00.000000000 Z
+date: 2012-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec