conred 0.2.6 → 0.2.7

data/Gemfile

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

data/README.md

@@ -1,8 +1,12 @@
+[![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 
-embeding from url, body formating (Of course we have Textile, but it is not good for all cases),
-external url protocol adding. These are the cases where Conred saves the day. 
+embeding from url, user input displaying, formating, trimming stripping,
+external url protocol adding and all that nasty stuff that we write in our apps. 
+These are the cases where Conred saves the day. 
 
 ## Installation
 
@@ -20,20 +24,31 @@ Or install it yourself as:
 
 ## Usage
 
-Right now (version 0.0.8) has several helpers and video class.
-For video you can use:
+### Iframe generetor for Youtube and Vimeo videos:
 
-    c = Conred::Video.new("http://www.youtube.com/watch?v=Lrj5Kxdzouc")
+    c = Conred::Video.new(
+      video_url: "http://www.youtube.com/watch?v=tNtW9pGFPTA&feature=plcp", 
+      width: 285, 
+      height: 185,
+      error_message: "Video url is invalid"
+    )
     
-Then for embed code:
+__NOTE:__ This is new constructor type as of version 0.3.0. 
+
+Then you can get your ready embed code like this (Conred will recognize video provider by itself):
     
     c.code
     
-You can also check if it is youtube video or vimeo video like this:
+You can also check if it is youtube or vimeo video like this:
 
     c.youtube_video? ==> true
     c.vimeo_video? ==> false
-Currently video feature works with Youtube and Vimeo URL's
+    
+Or if it exists:
+
+    c.exists? ==> true
+
+### General helpers for rails app
     
 If you wish to use text helpers then in your application_helper add this include line:
 
@@ -51,8 +66,7 @@ Sanitizes body, allowed tags are(p a strong ul ol li blockquote strike u em):
     
 External link formating
 
-    external_url("www.google.lv") => "http://www.google.lv"
-
+    external_url("www.google.com") => "http://www.google.com"
 
 ## Contributing
 
@@ -61,3 +75,9 @@ External link formating
 3. Create tests for it (Important!)
 4. Create new Pull Request
 5. Be happy
+
+## Thank you's
+
+I would like to thank these guys for contributing:
+@alexcp
+@barisbalic

data/conred.gemspec

@@ -8,8 +8,10 @@ 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_dependency "actionpack"
+  gem.add_development_dependency "rake"
+  gem.add_development_dependency "actionpack"
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/lib/conred.rb

@@ -5,5 +5,13 @@ require "conred/video"
 require "conred/links"
 require "haml"
 module Conred
-
-end
+  def Video.new arguments
+    if Video::Youtube.url_format_is_valid? arguments[:video_url]
+      Video::Youtube.new arguments
+    elsif Video::Vimeo.url_format_is_valid? arguments[:video_url]
+      Video::Vimeo.new arguments
+    else
+      Video::Other.new arguments
+    end
+  end
+end

data/lib/conred/version.rb

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

data/lib/conred/video.rb

@@ -2,80 +2,104 @@ require "conred/version"
 require "action_view"
 require "net/http"
 module Conred
-  class Video
-    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?
-        video_from_youtube_url
-      elsif vimeo_video?
-        video_from_vimeo_url
-      else
-        @error_message
-      end
+  module Video
+    def initialize(arguments = {:width => 670, :height => 450, :error_message => "Video url you have provided is invalid"})
+      @width = arguments[:width]
+      @height = arguments[:height]
+      @error_message = arguments[:error_message]
+      @video_id = get_video_id_from arguments[:video_url]
     end
 
     def youtube_video?
-      /^(http:\/\/)*(www\.)*(youtube.com|youtu.be)/ =~ @video_url ? true : false
+      is_a?(Video::Youtube)
     end
 
     def vimeo_video?
-      /^(http:\/\/)*(www\.)*(vimeo.com)/ =~ @video_url ? true : false
+      is_a?(Video::Vimeo)
     end
 
-
-    def video_from_vimeo_url
-      vimeo_partial = "../views/video/vimeo_iframe"
+    def code
       render(
-        vimeo_partial, 
-        :vimeo_id => video_id, 
-        :height => @height, 
+        :video_link => video_link,
+        :height => @height,
         :width => @width
       ).html_safe
     end
 
-    def video_from_youtube_url
-      youtube_partial = "../views/video/youtube_iframe"
-      render(
-        youtube_partial,
-        :youtube_id => video_id,
-        :height => @height,
-        :width => @width
-      ).html_safe
+    def exist?
+      response = Net::HTTP.get_response(URI(api_uri))
+      response.is_a?(Net::HTTPSuccess)
     end
 
-    def render(path_to_partial, locals = {})
+    private
+
+    def render(locals = {})
       path = File.join(
         File.dirname(__FILE__),
-        path_to_partial.split("/")
+        "../views/video/video_iframe".split("/")
       )
       Haml::Engine.new(File.read("#{path}.html.haml")).render(Object.new, locals)
     end
 
-    def video_id
-      if @video_url[/vimeo\.com\/([0-9]*)/]
-        video_id = $1
-      elsif @video_url[/youtu\.be\/([^\?]*)/]
-        video_id = $1
-      else
-        @video_url[/(v=([A-Za-z0-9_-]*))/]
-        video_id = $2
+    class Youtube
+      include Video
+
+      def self.url_format_is_valid? url
+        /^(http:\/\/)*(www\.)*(youtube.com|youtu.be)/ =~ url
+      end
+
+      def api_uri
+        "http://gdata.youtube.com/feeds/api/videos/#{@video_id}"
+      end
+
+      def video_link
+        "http://www.youtube.com/embed/#{@video_id}?wmode=transparent"
+      end
+
+      private
+
+      def get_video_id_from url
+        if url[/youtu\.be\/([^\?]*)/]
+          video_id = $1
+        else
+          url[/(v=([A-Za-z0-9_-]*))/]
+          video_id = $2
+        end
       end
     end
 
-    def exist?
-      if youtube_video?
-        response = Net::HTTP.get_response(URI("http://gdata.youtube.com/feeds/api/videos/#{video_id}"))
-      else
-        response = Net::HTTP.get_response(URI("http://vimeo.com/api/v2/video/#{video_id}.json"))
+    class Vimeo
+      include Video
+
+      def self.url_format_is_valid? url
+        /^(http:\/\/)*(www\.)*(vimeo.com)/ =~ url
+      end
+
+      def api_uri
+        "http://vimeo.com/api/v2/video/#{@video_id}.json"
+      end
+
+      def video_link
+        "http://player.vimeo.com/video/#{@video_id}"
+      end
+
+      private
+
+      def get_video_id_from url
+        url[/vimeo\.com\/([0-9]*)/]
+        video_id = $1
       end
-      response.is_a?(Net::HTTPSuccess)
     end
 
+    class Other
+      include Video
+      def initialize(arguments = {:error_message => "Video url you have provided is invalid"})
+        @error_message = arguments[:error_message]
+      end
+
+      def code
+        @error_message
+      end
+    end
   end
 end

data/lib/views/video/video_iframe.html.haml

@@ -0,0 +1 @@
+%iframe{:allowFullScreen => "", :frameborder => "0", :height => height, :mozallowfullscreen => "", :src => "#{video_link}", :webkitAllowFullScreen => "", :width => width}

data/spec/conred_spec/video_spec.rb

@@ -3,14 +3,14 @@ require "conred"
 describe Conred do
   describe Conred::Video do
 
-    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")}
+    let(:short_youtube_url) {Conred::Video.new(:video_url=>"http://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(: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
@@ -30,26 +30,42 @@ describe Conred do
       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/)
-      Conred::Video.new("http://www.youtube.com/watch?v=Lrj5Kxdzouc", 450, 300).code.should match(/width='450'/)
-      Conred::Video.new("http://www.youtube.com/watch?v=Lrj5Kxdzouc", 450, 300).code.should match(/height='300'/)
-      Conred::Video.new("http://vimeo.com/49556689", 450, 300).code.should match(/49556689/)
-      Conred::Video.new("http://vimeo.com/49556689", 450, 300).code.should match(/width='450'/)
-      Conred::Video.new("http://vimeo.com/49556689", 450, 300).code.should match(/height='300'/)
-      Conred::Video.new("http://google.com/12311233", 450, 300, "Some mistake in url").code.should == "Some mistake in url"
+    describe "youtube embed code" do
+      subject {Conred::Video.new(:video_url=>"http://www.youtube.com/watch?v=Lrj5Kxdzouc", :width=>450,:height=> 300).code }
+      it { should match(/Lrj5Kxdzouc/)}
+      it { should match(/width='450'/)}
+      it {should match(/height='300'/)} 
+    end
+
+    describe "vimeo embed code" do
+      subject { Conred::Video.new(:video_url=>"http://vimeo.com/49556689", :width=>450, :height=>300).code }
+      it {should match(/49556689/)}
+      it {should match(/width='450'/)}
+      it {should match(/height='300'/)}
+    end
+
+    it "should render error message when url is invalid" do
+      Conred::Video.new(:video_url=>"http://google.com/12311233", :width=>450, :height=>300, :error_message=>"Some mistake in url").code.should == "Some mistake in url"
+    end
+
+    it "should return correct embed code when passing arguments in url" do
+      Conred::Video.new(:video_url=>"http://www.youtube.com/watch?NR=1&feature=endscreen&v=Lrj5Kxdzouc",:width=> 450,:height=> 300).code.should match(/Lrj5Kxdzouc/)
     end
 
     describe "check if a video exist" do
       it "should return false if request 404" do
-        non_existing_video = Conred::Video.new("http://www.youtube.com/watch?v=Lrj5Kxdzoux")
+        non_existing_video = Conred::Video.new(:video_url=>"http://www.youtube.com/watch?v=Lrj5Kxdzoux")
         Net::HTTP.stub(:get_response=>Net::HTTPNotFound.new(true, 404, "Not Found"))
         non_existing_video.exist?.should be_false
       end
 
+      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")
+      end
+
       it "should be true if response is 200" do
-        existing_video = Conred::Video.new("http://www.youtube.com/watch?v=Lrj5Kxdzouc")
+        existing_video = Conred::Video.new(:video_url=>"http://www.youtube.com/watch?v=Lrj5Kxdzouc")
         Net::HTTP.stub(:get_response=>Net::HTTPOK.new(true,200,"OK"))
         existing_video.exist?.should be_true
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conred
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-11 00:00:00.000000000 Z
+date: 2013-04-10 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
@@ -27,6 +43,22 @@ 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
@@ -35,7 +67,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -61,8 +93,7 @@ files:
 - lib/conred/links.rb
 - lib/conred/version.rb
 - lib/conred/video.rb
-- lib/views/video/vimeo_iframe.html.haml
-- lib/views/video/youtube_iframe.html.haml
+- lib/views/video/video_iframe.html.haml
 - spec/conred_spec.rb
 - spec/conred_spec/helpers_spec.rb
 - spec/conred_spec/video_spec.rb

data/lib/views/video/vimeo_iframe.html.haml

@@ -1 +0,0 @@
-%iframe{:allowFullScreen => "", :frameborder => "0", :height => height, :mozallowfullscreen => "", :src => "http://player.vimeo.com/video/#{vimeo_id}", :webkitAllowFullScreen => "", :width => width}

data/lib/views/video/youtube_iframe.html.haml

@@ -1 +0,0 @@
-%iframe{:allowfullscreen => "", :frameborder => "0", :height => height, :src => "http://www.youtube.com/embed/#{youtube_id}?wmode=transparent", :title => "YouTube video player", :width => width}