conred 0.0.9 → 0.0.10

data/lib/conred/helpers.rb

@@ -1,5 +1,4 @@
 require "conred/version"
-require "action_view"
 
 module Conred
 
@@ -7,19 +6,19 @@ module Conred
     
     extend self
 
+    @action_view = ActionView::Base.new
+
     def sanitize_and_trim(text, word_count = nil, omission = '...')
-      action_view = ActionView::Base.new
-      text = action_view.strip_tags(text)
+      text = @action_view.strip_tags(text)
       if word_count
-        action_view.truncate(text, :length => word_count, :omission => omission)
+        @action_view.truncate(text, :length => word_count, :omission => omission)
       else
         text
       end
     end
 
     def sanitize_body(text)
-      action_view = ActionView::Base.new
-      text = action_view.sanitize(text, :tags => %w(p a strong ul ol li blockquote strike u em), :attributes => %w(href))
+      text = @action_view.sanitize(text, :tags => %w(p a strong ul ol li blockquote strike u em), :attributes => %w(href))
       text.html_safe
     end
 

data/lib/conred/version.rb

@@ -1,3 +1,3 @@
 module Conred
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

data/lib/conred/video.rb

@@ -50,6 +50,7 @@ module Conred
         allowFullScreen>
       </iframe>
       eos
+      .html_safe
     end
 
     def video_from_youtube_url
@@ -70,6 +71,7 @@ module Conred
         allowfullscreen>
       </iframe>
       eos
+      .html_safe
     end
   end
 end

data/spec/conred_spec.rb

@@ -1,81 +1,5 @@
 require "conred"
 
 describe Conred do
-  describe Conred::Helpers do
-
-    before do
-      @html_text = "<p>Evil string</p> <a href='http://evilsite.com'>Link to some evil site</a>"
-    end
-
-    it "should return cleaned out text from html" do
-      Conred::Helpers.sanitize_and_trim(@html_text).should == "Evil string Link to some evil site"
-    end
-
-    it "should truncate string to fourteen symbols" do
-      Conred::Helpers.sanitize_and_trim(@html_text, 14).should == "Evil string..."
-    end
-
-    it "should use different truncate text at the ending of the line" do
-      Conred::Helpers.sanitize_and_trim(@html_text, 11, "").should == "Evil string"
-    end
-  end
-
-  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' 
-        frameborder='0' 
-        allowfullscreen>
-      </iframe>
-      eos
-
-
-    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
-      Conred::Video.new("http://youtu.be/SZt5RFzqEfY").should be_youtube_video
-      Conred::Video.new("youtu.be/SZt5RFzqEfY").should be_youtube_video
-      Conred::Video.new("youtube.com/watch?v=SZt5RFzqEfY&feature=g-all-fbc").should be_youtube_video
-      Conred::Video.new("www.youtube.com/watch?v=SZt5RFzqEfY&feature=g-all-fbc").should be_youtube_video
-      Conred::Video.new("www.youtu.be/SZt5RFzqEfY").should be_youtube_video
-      Conred::Video.new("youtube.com/watch?v=SZt5RFzqEfY&feature=g-all-fbc").should be_youtube_video
-      Conred::Video.new("www.youtube.com/watch?v=SZt5RFzqEfY&feature=g-all-fbc").should be_youtube_video
-      Conred::Video.new("www.youtu.be/SZt5RFzqEfY").should be_youtube_video
-    end
-    it "should match vimeo video" do
-      Conred::Video.new("http://vimeo.com/12311233").youtube_video? == false
-      Conred::Video.new("vimeo.com/12311233").youtube_video? == false
-      Conred::Video.new("http://www.vimeo.com/12311233http://youtube.com/12311233").youtube_video? == false
-      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"
-    end
-  end
-
-  describe Conred::Links do
-
-  end
-
+  
 end

data/spec/conred_spec/video_spec.rb

@@ -0,0 +1,57 @@
+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' 
+        frameborder='0' 
+        allowfullscreen>
+      </iframe>
+      eos
+
+
+    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
+      Conred::Video.new("http://youtu.be/SZt5RFzqEfY").should be_youtube_video
+      Conred::Video.new("youtu.be/SZt5RFzqEfY").should be_youtube_video
+      Conred::Video.new("youtube.com/watch?v=SZt5RFzqEfY&feature=g-all-fbc").should be_youtube_video
+      Conred::Video.new("www.youtube.com/watch?v=SZt5RFzqEfY&feature=g-all-fbc").should be_youtube_video
+      Conred::Video.new("www.youtu.be/SZt5RFzqEfY").should be_youtube_video
+      Conred::Video.new("youtube.com/watch?v=SZt5RFzqEfY&feature=g-all-fbc").should be_youtube_video
+      Conred::Video.new("www.youtube.com/watch?v=SZt5RFzqEfY&feature=g-all-fbc").should be_youtube_video
+      Conred::Video.new("www.youtu.be/SZt5RFzqEfY").should be_youtube_video
+    end
+    it "should match vimeo video" do
+      Conred::Video.new("http://vimeo.com/12311233").youtube_video? == false
+      Conred::Video.new("vimeo.com/12311233").youtube_video? == false
+      Conred::Video.new("http://www.vimeo.com/12311233http://youtube.com/12311233").youtube_video? == false
+      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"
+    end
+  end
+end

metadata

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