conred 0.2.8 → 0.3.0

data/Gemfile

@@ -1,4 +1,6 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in conred.gemspec
-gemspec
+gemspec
+gem 'rake'
+gem 'haml'

data/README.md

@@ -1,6 +1,3 @@
-[![Code Climate](https://codeclimate.com/github/janjiss/conred.png)](https://codeclimate.com/github/janjiss/conred)
-[![Build Status](https://travis-ci.org/janjiss/conred.png?branch=master)](https://travis-ci.org/janjiss/conred)
-
 # Conred
 
 In every project we have common things like video 

data/conred.gemspec

@@ -8,10 +8,8 @@ Gem::Specification.new do |gem|
   gem.summary       = %q{ConcepticHQ reusable code}
   gem.homepage      = "http://github.com/janjiss/conred"
 
-  gem.add_dependency "haml"
   gem.add_development_dependency "rspec"
-  gem.add_development_dependency "rake"
-  gem.add_development_dependency "actionpack"
+  gem.add_dependency "actionpack"
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/lib/conred/version.rb

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

data/lib/conred/video.rb

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

data/spec/conred_spec/video_spec.rb

@@ -4,19 +4,16 @@ 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
@@ -30,7 +27,6 @@ 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  
 
@@ -65,7 +61,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("//gdata.youtube.com/feeds/api/videos/Lrj5Kxdzoux")
+        non_existing_video.api_uri.should eq("http://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.8
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-10 00:00:00.000000000 Z
+date: 2013-01-15 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: haml
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -43,22 +27,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
@@ -67,7 +35,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false