conred 0.2.7 → 0.2.8

data/lib/conred/version.rb

@@ -1,3 +1,3 @@
 module Conred
-  VERSION = "0.2.7"
+  VERSION = "0.2.8"
 end

data/lib/conred/video.rb

@@ -45,15 +45,15 @@ module Conred
       include Video
 
       def self.url_format_is_valid? url
-        /^(http:\/\/)*(www\.)*(youtube.com|youtu.be)/ =~ url
+        /^(http|https)*(:\/\/)*(www\.)*(youtube.com|youtu.be)/ =~ url
       end
 
       def api_uri
-        "http://gdata.youtube.com/feeds/api/videos/#{@video_id}"
+        "//gdata.youtube.com/feeds/api/videos/#{@video_id}"
       end
 
       def video_link
-        "http://www.youtube.com/embed/#{@video_id}?wmode=transparent"
+        "//www.youtube.com/embed/#{@video_id}?wmode=transparent"
       end
 
       private
@@ -72,15 +72,15 @@ module Conred
       include Video
 
       def self.url_format_is_valid? url
-        /^(http:\/\/)*(www\.)*(vimeo.com)/ =~ url
+        /^(http|https)*(:\/\/)*(www\.)*(vimeo.com)/ =~ url
       end
 
       def api_uri
-        "http://vimeo.com/api/v2/video/#{@video_id}.json"
+        "//vimeo.com/api/v2/video/#{@video_id}.json"
       end
 
       def video_link
-        "http://player.vimeo.com/video/#{@video_id}"
+        "//player.vimeo.com/video/#{@video_id}"
       end
 
       private

data/spec/conred_spec/video_spec.rb

@@ -4,16 +4,19 @@ describe Conred do
   describe Conred::Video do
 
     let(:short_youtube_url) {Conred::Video.new(:video_url=>"http://youtu.be/SZt5RFzqEfY")}
+    let(:https_youtube_url) {Conred::Video.new(:video_url=>"https://youtu.be/SZt5RFzqEfY")}
     let(:short_youtube_url_with_www) {Conred::Video.new(:video_url=>"www.youtu.be/SZt5RFzqEfY")}
     let(:long_youtube_url_with_features) {Conred::Video.new(:video_url=>"http://www.youtube.com/watch?NR=1&feature=endscreen&v=Lrj5Kxdzouc")}
     let(:short_youtube_url_without_http_and_www) {Conred::Video.new(:video_url=>"youtu.be/SZt5RFzqEfY")}
 
     let(:vimeo_url) {Conred::Video.new(:video_url=>"http://vimeo.com/12311233")}
+    let(:https_vimeo_url) {Conred::Video.new(:video_url=>"http://vimeo.com/12311233")}
     let(:evil_vimeo) {Conred::Video.new(:video_url=>"eeevil vimeo www.vimeo.com/12311233")}
     let(:vimeo_without_http) {Conred::Video.new(:video_url=>"vimeo.com/12311233")}
     
     it "should match youtube video" do
       short_youtube_url.should be_youtube_video
+      https_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
@@ -27,6 +30,7 @@ describe Conred do
     it "should match vimeo video" do
       vimeo_url.should_not be_youtube_video
       vimeo_without_http.should be_vimeo_video
+      https_vimeo_url.should be_vimeo_video
       vimeo_url.should be_vimeo_video
     end  
 
@@ -61,7 +65,7 @@ describe Conred do
 
       it "should make a request to the proper uri" do
         non_existing_video = Conred::Video.new(:video_url=>"http://www.youtube.com/watch?v=Lrj5Kxdzoux")
-        non_existing_video.api_uri.should eq("http://gdata.youtube.com/feeds/api/videos/Lrj5Kxdzoux")
+        non_existing_video.api_uri.should eq("//gdata.youtube.com/feeds/api/videos/Lrj5Kxdzoux")
       end
 
       it "should be true if response is 200" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conred
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
   prerelease: 
 platform: ruby
 authors: