dejan-auto_html 1.1.2 → 1.2.0

data/CHANGELOG.rdoc

@@ -1,3 +1,9 @@
+== 1.2.0, released 2009-09-26
+
+* link filter now uses Rails' link discovery engine. Closes: http://github.com/dejan/auto_html/issues#issue/2 and  http://github.com/dejan/auto_html/issues#issue/3 if Rails 2.3+ is in use.
+* added dailymotion filter
+* added sanitize filter
+
 == 1.1.2, released 2009-09-24
 
 * link filter fix. Closes: http://github.com/dejan/auto_html/issues#issue/2 

data/README.rdoc

@@ -1,6 +1,6 @@
 = auto_html
 
-Rails plugin for embedding rich content by converting provided URL's to appropriate HTML blocks for links, images, youtube, vimeo, google video and more.
+Rails plugin for transforming urls to appropriate resource (image, link, YouTube, Vimeo video,...). Check out the {live demo}[http://auto_html.rors.org].
 
 
 == Synopsis
@@ -54,6 +54,7 @@ Plugin is highly customizable, and you can easily create new filters that will t
 == Bundled filters
 
 For filter list and options they support check: http://github.com/dejan/auto_html/tree/master/lib/auto_html/filters 
+NOTE: auto_html uses Rails' engine for discovering links. There are some bugs with that engine in versions under Rails 2.3.
 
 
 == Install
@@ -63,7 +64,7 @@ For filter list and options they support check: http://github.com/dejan/auto_htm
 To enable the library in your Rails 2.1 (or greater) project, use the gem configuration method in "config/environment.rb"
 
   Rails::Initializer.run do |config|
-    config.gem 'dejan-auto_html', :version => '~> 1.1.0', :lib => 'auto_html', :source => 'http://gems.github.com'
+    config.gem 'dejan-auto_html', :version => '~> 1.1.2', :lib => 'auto_html', :source => 'http://gems.github.com'
   end
 
 === As a Rails plugin

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 1
-:minor: 1
-:patch: 2
+:minor: 2
+:patch: 0

data/auto_html.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{auto_html}
-  s.version = "1.1.2"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dejan Simic"]
-  s.date = %q{2009-09-24}
+  s.date = %q{2009-09-26}
   s.description = %q{Automatically transforms urls (via domain) and includes the destination resource (Vimeo, YouTube movie, image, ...) in your document}
   s.email = %q{desimic@gmail.com}
   s.extra_rdoc_files = [
@@ -28,10 +28,12 @@ Gem::Specification.new do |s|
      "lib/auto_html/base.rb",
      "lib/auto_html/builder.rb",
      "lib/auto_html/filter.rb",
+     "lib/auto_html/filters/dailymotion.rb",
      "lib/auto_html/filters/google_video.rb",
      "lib/auto_html/filters/html_escape.rb",
      "lib/auto_html/filters/image.rb",
      "lib/auto_html/filters/link.rb",
+     "lib/auto_html/filters/sanitize.rb",
      "lib/auto_html/filters/simple_format.rb",
      "lib/auto_html/filters/vimeo.rb",
      "lib/auto_html/filters/youtube.rb",
@@ -43,10 +45,12 @@ Gem::Specification.new do |s|
      "test/functional/auto_html_for_test.rb",
      "test/test_helper.rb",
      "test/unit/auto_html_test.rb",
+     "test/unit/filters/dailymotion_test.rb",
      "test/unit/filters/google_video_test.rb",
      "test/unit/filters/html_escape_test.rb",
      "test/unit/filters/image_test.rb",
      "test/unit/filters/link_test.rb",
+     "test/unit/filters/sanitize_test.rb",
      "test/unit/filters/simple_format_test.rb",
      "test/unit/filters/vimeo_test.rb",
      "test/unit/filters/youtube_test.rb",
@@ -64,10 +68,12 @@ Gem::Specification.new do |s|
      "test/functional/auto_html_for_test.rb",
      "test/test_helper.rb",
      "test/unit/auto_html_test.rb",
+     "test/unit/filters/dailymotion_test.rb",
      "test/unit/filters/google_video_test.rb",
      "test/unit/filters/html_escape_test.rb",
      "test/unit/filters/image_test.rb",
      "test/unit/filters/link_test.rb",
+     "test/unit/filters/sanitize_test.rb",
      "test/unit/filters/simple_format_test.rb",
      "test/unit/filters/vimeo_test.rb",
      "test/unit/filters/youtube_test.rb",

data/lib/auto_html/filters/dailymotion.rb

@@ -0,0 +1,6 @@
+AutoHtml.add_filter(:dailymotion).with(:width => 480, :height => 360) do |text, options|
+  text.gsub(/http:\/\/www\.dailymotion\.com.*\/video\/(.+)_*/) do
+    video_id = $1
+    %{<object type="application/x-shockwave-flash" data="http://www.dailymotion.com/swf/#{video_id}&related=0" width="#{options[:width]}" height="#{options[:height]}"><param name="movie" value="http://www.dailymotion.com/swf/#{video_id}&related=0"></param><param name="allowFullScreen" value="true"></param><param name="allowScriptAccess" value="always"></param><a href="http://www.dailymotion.com/video/#{video_id}?embed=1"><img src="http://www.dailymotion.com/thumbnail/video/#{video_id}" width="#{options[:width]}" height="#{options[:height]}"/></a></object>}
+  end
+end

data/lib/auto_html/filters/link.rb

@@ -1,48 +1,5 @@
-# major portion of code in here is copied/adjusted from 
-# ActionView::Helpers::TagHelper and
-# ActionView::Helpers::TextHelper
-#
-AutoHtml.add_filter(:link).with({}) do |text, options|
-
-  def tag_options(options)
-    unless options.blank?
-      attrs = []
-      attrs = options.map { |key, value| %(#{key}="#{value}") }
-      " #{attrs.sort * ' '}" unless attrs.empty?
-    end
-  end
+require 'action_view'
 
-  def auto_link_re
-    %r{
-      (                          # leading text
-        <\w+.*?>|                # leading HTML tag, or
-        [^=!:'"/]|               # leading punctuation, or
-        ^                        # beginning of line
-      )
-      (
-        (?:https?://)|           # protocol spec, or
-        (?:www\.)                # www.*
-      )
-      (
-        [-\w]+                   # subdomain or domain
-        (?:\.[-\w]+)*            # remaining subdomains or domain
-        (?::\d+)?                # port
-        (?:/(?:[~\w\+@%=\(\)-]|(?:[,.;:'][^\s$]))*)* # path
-        (?:[\?|\#][\w\+@%&=.;:-]+)?     # query string
-        (?:\#[\w\-]*)?           # trailing anchor
-      )
-      ([[:punct:]]|<|$|)       # trailing text
-     }x
-  end
-
-  extra_options = tag_options(options.stringify_keys) || ""
-  text.gsub(auto_link_re) do
-    all, a, b, c, d = $&, $1, $2, $3, $4
-    if a =~ /<a\s/i # don't replace URL's that are already linked
-      all
-    else
-      text = b + c
-      %(#{a}<a href="#{b=="www."?"http://www.":b}#{c}"#{extra_options}>#{text}</a>#{d})
-    end
-  end
+AutoHtml.add_filter(:link).with({}) do |text, options|
+  ActionView::Base.new.auto_link(text, :all, options)
 end

data/lib/auto_html/filters/sanitize.rb

@@ -0,0 +1,6 @@
+require 'action_controller'
+require 'cgi'
+
+AutoHtml.add_filter(:sanitize).with({}) do |text, options|
+  HTML::WhiteListSanitizer.new.sanitize(text, options)
+end

data/test/unit/filters/dailymotion_test.rb

@@ -0,0 +1,20 @@
+require File.dirname(__FILE__) + '/../unit_test_helper'
+
+class GoogleVideoTest < Test::Unit::TestCase
+
+  def test_transform
+    result = auto_html("http://www.dailymotion.com/en/featured/video/xag4p2_tempsmorttv-episode-01_shortfilms") { dailymotion }
+    assert_equal '<object type="application/x-shockwave-flash" data="http://www.dailymotion.com/swf/xag4p2_tempsmorttv-episode-01_shortfilms&related=0" width="480" height="360"><param name="movie" value="http://www.dailymotion.com/swf/xag4p2_tempsmorttv-episode-01_shortfilms&related=0"></param><param name="allowFullScreen" value="true"></param><param name="allowScriptAccess" value="always"></param><a href="http://www.dailymotion.com/video/xag4p2_tempsmorttv-episode-01_shortfilms?embed=1"><img src="http://www.dailymotion.com/thumbnail/video/xag4p2_tempsmorttv-episode-01_shortfilms" width="480" height="360"/></a></object>', result
+  end
+
+  def test_transform_with_tweaked_width
+    result = auto_html("http://www.dailymotion.com/related/x9cyf6/video/x9tinl_happy-tree-friends-as-you-wish-part_fun") { dailymotion :width => 500 }
+    assert_equal '<object type="application/x-shockwave-flash" data="http://www.dailymotion.com/swf/x9tinl_happy-tree-friends-as-you-wish-part_fun&related=0" width="500" height="360"><param name="movie" value="http://www.dailymotion.com/swf/x9tinl_happy-tree-friends-as-you-wish-part_fun&related=0"></param><param name="allowFullScreen" value="true"></param><param name="allowScriptAccess" value="always"></param><a href="http://www.dailymotion.com/video/x9tinl_happy-tree-friends-as-you-wish-part_fun?embed=1"><img src="http://www.dailymotion.com/thumbnail/video/x9tinl_happy-tree-friends-as-you-wish-part_fun" width="500" height="360"/></a></object>', result
+  end
+
+  def test_transform_with_options
+    result = auto_html("http://www.dailymotion.com/video/xakv5i") { dailymotion(:width => 500, :height => 300) }
+    assert_equal '<object type="application/x-shockwave-flash" data="http://www.dailymotion.com/swf/xakv5i&related=0" width="500" height="300"><param name="movie" value="http://www.dailymotion.com/swf/xakv5i&related=0"></param><param name="allowFullScreen" value="true"></param><param name="allowScriptAccess" value="always"></param><a href="http://www.dailymotion.com/video/xakv5i?embed=1"><img src="http://www.dailymotion.com/thumbnail/video/xakv5i" width="500" height="300"/></a></object>', result
+  end
+
+end

data/test/unit/filters/link_test.rb

@@ -7,14 +7,29 @@ class LinkTest < Test::Unit::TestCase
     assert_equal '<a href="http://vukajlija.com">http://vukajlija.com</a>', result
   end
 
+  def test_transform_with_the_slash_at_the_end
+    result = auto_html("http://github.com/") { link }
+    assert_equal '<a href="http://github.com/">http://github.com/</a>', result
+  end
+
   def test_transform_with_param
-    result = auto_html('http://google.com/abc?query=ruby') { link }
-    assert_equal '<a href="http://google.com/abc?query=ruby">http://google.com/abc?query=ruby</a>', result
+    result = auto_html('http://example.com/abc?query=ruby') { link }
+    assert_equal '<a href="http://example.com/abc?query=ruby">http://example.com/abc?query=ruby</a>', result
+  end
+
+  def test_transform_with_param_and_trailing_dot
+    result = auto_html('http://example.com/abc?query=ruby.') { link }
+    assert_equal '<a href="http://example.com/abc?query=ruby">http://example.com/abc?query=ruby</a>.', result
+  end
+
+  def test_transform_with_anchor_and_trailing_dot
+    result = auto_html('http://example.com/example#id=123.12.') { link }
+    assert_equal '<a href="http://example.com/example#id=123.12">http://example.com/example#id=123.12</a>.', result
   end
 
   def test_transform_with_params
     result = auto_html('http://www.youtube.com/watch?v=s5C5Zk4kobo&feature=related') { link }
-    assert_equal '<a href="http://www.youtube.com/watch?v=s5C5Zk4kobo&feature=related">http://www.youtube.com/watch?v=s5C5Zk4kobo&feature=related</a>', result
+    assert_equal '<a href="http://www.youtube.com/watch?v=s5C5Zk4kobo&amp;feature=related">http://www.youtube.com/watch?v=s5C5Zk4kobo&amp;feature=related</a>', result
   end
 
   def test_transform_with_commas
@@ -24,7 +39,7 @@ class LinkTest < Test::Unit::TestCase
 
   def test_transform_complex_url
     result = auto_html("http://www.google.com/#q=nikola+tesla&ct=tesla09&oi=ddle&fp=Xmf0jJ9P_V0") { link }
-    assert_equal '<a href="http://www.google.com/#q=nikola+tesla&ct=tesla09&oi=ddle&fp=Xmf0jJ9P_V0">http://www.google.com/#q=nikola+tesla&ct=tesla09&oi=ddle&fp=Xmf0jJ9P_V0</a>', result
+    assert_equal '<a href="http://www.google.com/#q=nikola+tesla&amp;ct=tesla09&amp;oi=ddle&amp;fp=Xmf0jJ9P_V0">http://www.google.com/#q=nikola+tesla&amp;ct=tesla09&amp;oi=ddle&amp;fp=Xmf0jJ9P_V0</a>', result
   end
 
   def test_transform_with_options

data/test/unit/filters/sanitize_test.rb

@@ -0,0 +1,36 @@
+require File.dirname(__FILE__) + '/../unit_test_helper'
+
+class SanitizeTest < Test::Unit::TestCase
+
+  def test_trasform
+    result = auto_html("<script>alert(0)</script>") { sanitize }
+    assert_equal "", result
+  end
+
+  def test_trasform2
+    result = auto_html("<div>test</div>") { sanitize }
+    assert_equal "<div>test</div>", result
+  end
+
+  def test_trasform3
+    result = auto_html("<div>test</div>") { sanitize :tags => %w(div) }
+    assert_equal "<div>test</div>", result
+  end
+
+  def test_trasform4
+    result = auto_html("<div>test</div>") { sanitize :tags => %w(p) }
+    assert_equal "test", result
+  end
+
+  def test_trasform5
+    result = auto_html("<a rel='nofollow'>test</div>") { sanitize :tags => %w(a), :attributes => %w(href)}
+    assert_equal "<a>test", result 
+    #
+    # from Rails doc:
+    #
+    #   Please note that sanitizing user-provided text does not 
+    #   guarantee that the resulting markup is valid.
+    #
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dejan-auto_html
 version: !ruby/object:Gem::Version 
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors: 
 - Dejan Simic
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-24 00:00:00 -07:00
+date: 2009-09-26 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -34,10 +34,12 @@ files:
 - lib/auto_html/base.rb
 - lib/auto_html/builder.rb
 - lib/auto_html/filter.rb
+- lib/auto_html/filters/dailymotion.rb
 - lib/auto_html/filters/google_video.rb
 - lib/auto_html/filters/html_escape.rb
 - lib/auto_html/filters/image.rb
 - lib/auto_html/filters/link.rb
+- lib/auto_html/filters/sanitize.rb
 - lib/auto_html/filters/simple_format.rb
 - lib/auto_html/filters/vimeo.rb
 - lib/auto_html/filters/youtube.rb
@@ -49,10 +51,12 @@ files:
 - test/functional/auto_html_for_test.rb
 - test/test_helper.rb
 - test/unit/auto_html_test.rb
+- test/unit/filters/dailymotion_test.rb
 - test/unit/filters/google_video_test.rb
 - test/unit/filters/html_escape_test.rb
 - test/unit/filters/image_test.rb
 - test/unit/filters/link_test.rb
+- test/unit/filters/sanitize_test.rb
 - test/unit/filters/simple_format_test.rb
 - test/unit/filters/vimeo_test.rb
 - test/unit/filters/youtube_test.rb
@@ -91,10 +95,12 @@ test_files:
 - test/functional/auto_html_for_test.rb
 - test/test_helper.rb
 - test/unit/auto_html_test.rb
+- test/unit/filters/dailymotion_test.rb
 - test/unit/filters/google_video_test.rb
 - test/unit/filters/html_escape_test.rb
 - test/unit/filters/image_test.rb
 - test/unit/filters/link_test.rb
+- test/unit/filters/sanitize_test.rb
 - test/unit/filters/simple_format_test.rb
 - test/unit/filters/vimeo_test.rb
 - test/unit/filters/youtube_test.rb