conred 0.1 → 0.1.1

data/Gemfile

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

data/README.md

@@ -1,6 +1,8 @@
 # Conred
 
-Conred stands for ConcepticHQ resuable and d in the end is added for awsomness
+In every project we have common things like video 
+embeding from url, body formating (Of course we hav Textile, but it is not good for all cases),
+external url protocol adding. And here Conred saves the day. 
 
 ## Installation
 
@@ -55,7 +57,7 @@ External link formating
 ## Contributing
 
 1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Added some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+2. Write your feature
+3. Create tests for it (Important!)
+4. Create new Pull Request
+5. Be happy

data/lib/conred.rb

@@ -3,7 +3,10 @@ require "action_view"
 require "conred/helpers"
 require "conred/video"
 require "conred/links"
-
+require "haml"
 module Conred
-
+  def self.render_file(filename)
+    contents = File.read(filename)
+    Haml::Engine.new(contents).render
+  end
 end

data/lib/conred/version.rb

@@ -1,3 +1,3 @@
 module Conred
-  VERSION = "0.1"
+  VERSION = "0.1.1"
 end

data/lib/conred/video.rb

@@ -20,58 +20,46 @@ module Conred
     end
 
     def youtube_video?
-      if /^(http:\/\/)*(www\.)*(youtube.com|youtu.be)/ =~ @video_url
-        true
-      end
+      /^(http:\/\/)*(www\.)*(youtube.com|youtu.be)/ =~ @video_url
     end
 
     def vimeo_video?
-      if /^(http:\/\/)*(www\.)*(vimeo.com)/ =~ @video_url
-        true
-      else
-        false
-      end
+      /^(http:\/\/)*(www\.)*(vimeo.com)/ =~ @video_url
     end
 
 
     def video_from_vimeo_url
       if @video_url[/vimeo\.com\/([0-9]*)/]
-        vimeo_id = $1
+        @vimeo_id = $1
       end
-      <<-eos
-      <iframe
-        id='vimeo_video'
-        src='http://player.vimeo.com/video/#{vimeo_id}'
-        width='#{@width}'
-        height='#{@height}'
-        frameborder='0'
-        webkitAllowFullScreen
-        mozallowfullscreen
-        allowFullScreen>
-      </iframe>
-      eos
-      .html_safe
+      vimeo_file = File.join(
+        File.dirname(__FILE__),
+        '..', 'views',
+        'video', 'vimeo_iframe.html.haml'
+      )
+      render_file(vimeo_file).html_safe
     end
 
     def video_from_youtube_url
       if @video_url[/youtu\.be\/([^\?]*)/]
-          youtube_id = $1
+          @youtube_id = $1
       else
-        @video_url[/^.*((v\/)|(embed\/)|(watch\?))\??v?=?([^\&\?]*).*/]
-        youtube_id = $5
+        @video_url[/(v=([A-Za-z0-9_]*))/]
+        @youtube_id = $2
+
       end
-      <<-eos
-      <iframe
-        id='youtube_video'
-        title='YouTube video player'
-        width='#{@width}'
-        height='#{@height}'
-        src='http://www.youtube.com/embed/#{ youtube_id }?wmode=transparent'
-        frameborder='0'
-        allowfullscreen>
-      </iframe>
-      eos
-      .html_safe
+      youtube_file = File.join(
+        File.dirname(__FILE__),
+        '..', 'views',
+        'video', 'youtube_iframe.html.haml'
+      )
+      render_file(youtube_file).html_safe
     end
+
+    def render_file(filename)
+      contents = File.read(filename)
+      Haml::Engine.new(contents).render
+    end
+
   end
 end

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

@@ -0,0 +1 @@
+%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

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

data/spec/conred_spec/video_spec.rb

@@ -3,33 +3,23 @@ require "conred"
 describe Conred do
   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?wmode=transparent'
-        frameborder='0'
-        allowfullscreen>
-      </iframe>
-      eos
 
+      @vimeo_code = "49556689"
+      vimeo_file = File.join(
+        File.dirname(__FILE__),
+        '..', '..', 'lib', 'views',
+        'video', 'vimeo_iframe.html.haml'
+      )
+      @vimeo_embed_code = Conred.render_file(vimeo_file).html_safe
 
+      @youtube_id = "Lrj5Kxdzouc"
+      youtube_file = File.join(
+        File.dirname(__FILE__),
+        '..', '..', 'lib', 'views',
+        'video', 'youtube_iframe.html.haml'
+      )
+      @youtube_embed_code = Conred.render_file(youtube_file).html_safe
+      
     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
@@ -49,9 +39,10 @@ describe Conred do
       Conred::Video.new("eeevil vimeo www.vimeo.com/12311233").youtube_video? == false
     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"
+      Conred::Video.new("http://www.youtube.com/watch?NR=1&feature=endscreen&v=Lrj5Kxdzouc", 450, 300).code.should == @youtube_embed_code
+      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
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conred
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -61,6 +61,8 @@ 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
 - spec/conred_spec.rb
 - spec/conred_spec/helpers_spec.rb
 - spec/conred_spec/video_spec.rb