conred 0.1.2 → 0.1.3

data/lib/conred.rb

@@ -5,8 +5,5 @@ 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.2"
+  VERSION = "0.1.3"
 end

data/lib/conred/video.rb

@@ -32,12 +32,8 @@ module Conred
       if @video_url[/vimeo\.com\/([0-9]*)/]
         @vimeo_id = $1
       end
-      vimeo_file = File.join(
-        File.dirname(__FILE__),
-        '..', 'views',
-        'video', 'vimeo_iframe.html.haml'
-      )
-      render_file(vimeo_file).html_safe
+      vimeo_file = "../views/video/vimeo_iframe"
+      render(vimeo_file, :vimeo_id => @vimeo_id, :height => @height, :width => @width).html_safe
     end
 
     def video_from_youtube_url
@@ -46,19 +42,17 @@ module Conred
       else
         @video_url[/(v=([A-Za-z0-9_]*))/]
         @youtube_id = $2
-
       end
-      youtube_file = File.join(
-        File.dirname(__FILE__),
-        '..', 'views',
-        'video', 'youtube_iframe.html.haml'
-      )
-      render_file(youtube_file).html_safe
+      youtube_file = "../views/video/youtube_iframe"
+      render(youtube_file, :youtube_id => @youtube_id, :height => @height, :width => @width).html_safe
     end
 
-    def render_file(filename)
-      contents = File.read(filename)
-      Haml::Engine.new(contents).render
+    def render(path_to_partial, locals = {})
+      path = File.join(
+        File.dirname(__FILE__),
+        path_to_partial.split("/")
+      )
+      Haml::Engine.new(File.read("#{path}.html.haml")).render(Object.new, locals)
     end
 
   end

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

@@ -1 +1 @@
-%iframe{:allowFullScreen => "", :frameborder => "0", :height => @height, :mozallowfullscreen => "", :src => "http://player.vimeo.com/video/#{@vimeo_id}", :webkitAllowFullScreen => "", :width => @width}
+%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 +1 @@
-%iframe{:allowfullscreen => "", :frameborder => "0", :height => @height, :src => "http://www.youtube.com/embed/#{@youtube_id}?wmode=transparent", :title => "YouTube video player", :width => @width}
+%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

@@ -4,22 +4,6 @@ describe Conred do
   describe Conred::Video do
     before do
 
-      @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
@@ -39,9 +23,13 @@ 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?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://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"
     end
   end

metadata

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