conred 0.0.2 → 0.0.3

data/lib/conred.rb

@@ -16,16 +16,20 @@ module Conred
   end
 
   class Video
-    attr_reader :code
-
-    def initialize(video_url)
+    def initialize(video_url, width = 670, height = 450, error_message = "Video url you have provided is invalid")
+      @width = width
+      @height = height
       @video_url = video_url
+      @error_message = error_message
+    end
+
+    def code
       if youtube_video?
-        @code = video_from_youtube_url(video_url)
+        video_from_youtube_url
       elsif vimeo_video?
-        @code = video_from_vimeo_url(video_url)
+        video_from_vimeo_url
       else
-        ""
+        @error_message
       end
     end
 
@@ -44,40 +48,42 @@ module Conred
     end
 
 
-    def video_from_vimeo_url(vimeo_url, width = 670, height = 450)
-      if vimeo_url[/youtu\.be\/([^\?]*)/]
+    def video_from_vimeo_url
+      if @video_url[/vimeo\.com\/([0-9]*)/]
         vimeo_id = $1
-      else
-        vimeo_url[/^.*((v\/)|(embed\/)|(watch\?))\??v?=?([^\&\?]*).*/]
-        vimeo_id = $5
       end
-      "<iframe 
+      <<-eos
+      <iframe
+        id='vimeo_video'
         src='http://player.vimeo.com/video/#{vimeo_id}'
-        width='#{width}' 
-        height='#{height}'
+        width='#{@width}' 
+        height='#{@height}'
         frameborder='0'
         webkitAllowFullScreen
         mozallowfullscreen
         allowFullScreen>
       </iframe>"
+      eos
     end
 
-    def video_from_youtube_url(youtube_url, width = 670, height = 450)
-      if youtube_url[/youtu\.be\/([^\?]*)/]
+    def video_from_youtube_url
+      if @video_url[/youtu\.be\/([^\?]*)/]
           youtube_id = $1
       else
-        youtube_url[/^.*((v\/)|(embed\/)|(watch\?))\??v?=?([^\&\?]*).*/]
+        @video_url[/^.*((v\/)|(embed\/)|(watch\?))\??v?=?([^\&\?]*).*/]
         youtube_id = $5
       end
-      "<iframe
+      <<-eos
+      <iframe
         id='youtube_video'
         title='YouTube video player' 
-        width='#{width}' 
-        height='#{height}' 
+        width='#{@width}' 
+        height='#{@height}' 
         src='http://www.youtube.com/embed/#{ youtube_id }' 
         frameborder='0' 
         allowfullscreen>
-      </iframe>".html_safe
+      </iframe>
+      eos
     end
   end
 

data/lib/conred/version.rb

@@ -1,3 +1,3 @@
 module Conred
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/conred_spec.rb

@@ -21,6 +21,35 @@ describe Conred do
   end
 
   describe Conred::Video do
+    before do
+      @vimeo_embed_code = <<-eos
+      <iframe
+        id='vimeo_video'
+        src='http://player.vimeo.com/video/49556689'
+        width='450' 
+        height='300'
+        frameborder='0'
+        webkitAllowFullScreen
+        mozallowfullscreen
+        allowFullScreen>
+      </iframe>"
+      eos
+
+      @youtube_embed_code = 
+      <<-eos
+      <iframe
+        id='youtube_video'
+        title='YouTube video player' 
+        width='450' 
+        height='300' 
+        src='http://www.youtube.com/embed/Lrj5Kxdzouc' 
+        frameborder='0' 
+        allowfullscreen>
+      </iframe>
+      eos
+
+
+    end
     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
@@ -38,12 +67,11 @@ describe Conred do
       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
     end  
-    # it "should not match any video video" do
-    #   Conred::Video.new("http://youtube.com/12311233").should not_be_vimeo_video
-    #   Conred::Video.new("ftp://vimeo.com/12311233").should not_be_vimeo_video
-    #   Conred::Video.new("http://www.youtube.com/watch?vimeo.com/12311233").should not_be_vimeo_video
-    #   Conred::Video.new("evil string http://vimeo.com/12311233").should not_be_vimeo_video
-    # end
+    it "should return correct embed code" do
+       Conred::Video.new("http://www.youtube.com/watch?v=Lrj5Kxdzouc", 450, 300).code.should == @youtube_embed_code
+       Conred::Video.new("http://vimeo.com/49556689", 450, 300).code.should == @vimeo_embed_code
+       Conred::Video.new("http://google.com/12311233", 450, 300, "Some mistake in url").code.should == "Some mistake in url"
+    end
   end
 
   describe Conred::Links do

metadata

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