conred 0.2 → 0.2.1
Sign up to get free protection for your applications and to get access to all the features.
- data/lib/conred/version.rb +1 -1
- data/lib/conred/video.rb +3 -3
- data/spec/conred_spec/video_spec.rb +23 -15
- metadata +2 -2
data/lib/conred/version.rb
CHANGED
data/lib/conred/video.rb
CHANGED
@@ -20,11 +20,11 @@ module Conred
|
|
20
20
|
end
|
21
21
|
|
22
22
|
def youtube_video?
|
23
|
-
/^(http:\/\/)*(www\.)*(youtube.com|youtu.be)/ =~ @video_url
|
23
|
+
/^(http:\/\/)*(www\.)*(youtube.com|youtu.be)/ =~ @video_url ? true : false
|
24
24
|
end
|
25
25
|
|
26
26
|
def vimeo_video?
|
27
|
-
/^(http:\/\/)*(www\.)*(vimeo.com)/ =~ @video_url
|
27
|
+
/^(http:\/\/)*(www\.)*(vimeo.com)/ =~ @video_url ? true : false
|
28
28
|
end
|
29
29
|
|
30
30
|
|
@@ -40,7 +40,7 @@ module Conred
|
|
40
40
|
if @video_url[/youtu\.be\/([^\?]*)/]
|
41
41
|
@youtube_id = $1
|
42
42
|
else
|
43
|
-
@video_url[/(v=([A-Za-z0-9_]*))/]
|
43
|
+
@video_url[/(v=([A-Za-z0-9_-]*))/]
|
44
44
|
@youtube_id = $2
|
45
45
|
end
|
46
46
|
youtube_file = "../views/video/youtube_iframe"
|
@@ -2,26 +2,34 @@ require "conred"
|
|
2
2
|
|
3
3
|
describe Conred do
|
4
4
|
describe Conred::Video do
|
5
|
-
before do
|
6
5
|
|
7
|
-
|
6
|
+
let(:short_youtube_url) {Conred::Video.new("http://youtu.be/SZt5RFzqEfY")}
|
7
|
+
let(:short_youtube_url_with_www) {Conred::Video.new("www.youtu.be/SZt5RFzqEfY")}
|
8
|
+
let(:long_youtube_url_with_features) {Conred::Video.new("http://www.youtube.com/watch?NR=1&feature=endscreen&v=Lrj5Kxdzouc")}
|
9
|
+
let(:short_youtube_url_without_http_and_www) {Conred::Video.new("youtu.be/SZt5RFzqEfY")}
|
10
|
+
|
11
|
+
let(:vimeo_url) {Conred::Video.new("http://vimeo.com/12311233")}
|
12
|
+
let(:evil_vimeo) {Conred::Video.new("eeevil vimeo www.vimeo.com/12311233")}
|
13
|
+
let(:vimeo_without_http) {Conred::Video.new("vimeo.com/12311233")}
|
14
|
+
|
8
15
|
it "should match youtube video" do
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
16
|
+
short_youtube_url.should be_youtube_video
|
17
|
+
short_youtube_url_with_www.should be_youtube_video
|
18
|
+
long_youtube_url_with_features.should be_youtube_video
|
19
|
+
short_youtube_url_without_http_and_www.should be_youtube_video
|
20
|
+
end
|
21
|
+
|
22
|
+
it "should check for corner cases" do
|
23
|
+
evil_vimeo.should_not be_youtube_video
|
24
|
+
evil_vimeo.should_not be_vimeo_video
|
18
25
|
end
|
26
|
+
|
19
27
|
it "should match vimeo video" do
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
Conred::Video.new("eeevil vimeo www.vimeo.com/12311233").youtube_video? == false
|
28
|
+
vimeo_url.should_not be_youtube_video
|
29
|
+
vimeo_without_http.should be_vimeo_video
|
30
|
+
vimeo_url.should be_vimeo_video
|
24
31
|
end
|
32
|
+
|
25
33
|
it "should return correct embed code" do
|
26
34
|
Conred::Video.new("http://www.youtube.com/watch?NR=1&feature=endscreen&v=Lrj5Kxdzouc", 450, 300).code.should match(/Lrj5Kxdzouc/)
|
27
35
|
Conred::Video.new("http://www.youtube.com/watch?v=Lrj5Kxdzouc", 450, 300).code.should match(/Lrj5Kxdzouc/)
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: conred
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version:
|
4
|
+
version: 0.2.1
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2012-12-
|
12
|
+
date: 2012-12-27 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: rspec
|