auto_html 1.3.7 → 1.4.0

data/README.md

@@ -56,9 +56,9 @@ AutoHtml is highly customizable, and you can easily create new filters that will
     end
 
 
-## Non-ActiveModel models
+## Non-ActiveRecord models
 
-AutoHtml uses standard ActiveModel API meaning you can include AutoHtmlFor module (that automates transformation of the field) in any non-ActiveRecord model that uses ActiveModel. Here's working [mongoid](http://mongoid.org/) example:
+AutoHtml uses standard ActiveModel API, which means that you can include AutoHtmlFor module (that automates transformation of the field) in any non-ActiveRecord model that uses ActiveModel. Here's working [mongoid](http://mongoid.org/) example:
 
     class Post
       include Mongoid::Document
@@ -80,31 +80,12 @@ For filter list and options they support check: <http://github.com/dejan/auto_ht
 
 ## Install
 
-### Important note on versions
-
-As from version 1.2.0 auto_html uses Rails' engine for discovering links. There are some bugs with that engine in versions under Rails 2.3.2. so it's recommended you use auto_html 1.1.2 in that case, since internal engine is used in that version.
-
-    for Rails <= 2.3.1 use auto_html 1.1.2<br/>
-    for Rails >= 2.3.2 use the latest auto_html
-
-### As a gem
-
-To enable the library in your Rails 2.1-2.3 project, use the gem configuration method in "config/environment.rb"
-
-    Rails::Initializer.run do |config|
-      config.gem 'auto_html'
-    end
-
-In Rails 3.0 specify the gem in your Gemfile
+Specify the gem in Gemfile of the project
 
     gem "auto_html"
 
-### As a Rails plugin
-
-    script/plugin install git://github.com/dejan/auto_html.git
-
 
 ## Credits
 
 Author: [Dejan Simic](http://github.com/dejan)<br/>
-Contributors: [Claudio Perez Gamayo](http://github.com/crossblaim), [Matt Polito](http://github.com/mattpolito), [Ryan Heneise](http://github.com/mysmallidea), [Caleb Wright](http://github.com/fabrikagency), [Derrick Camerino](https://github.com/robustdj), [Daniel Weinmann](https://github.com/danielweinmann)
+Contributors: [Claudio Perez Gamayo](http://github.com/crossblaim), [Matt Polito](http://github.com/mattpolito), [Ryan Heneise](http://github.com/mysmallidea), [Caleb Wright](http://github.com/fabrikagency), [Derrick Camerino](https://github.com/robustdj), [Daniel Weinmann](https://github.com/danielweinmann), [Edgars Beigarts](ebeigarts)

data/Rakefile

@@ -10,7 +10,7 @@ end
 
 desc 'Test with recent versions of Rails'
 task :test_with_recent do
-  versions = ['2.3.8', '3.0.3']
+  versions = ['2.1.0', '2.2.2', '2.3.8', '3.0.3', '3.0.9']
   versions.each do |v|
     puts "\n###### TESTING WITH RAILS #{v}"
     ENV['RAILS_VERSION'] = v

data/lib/auto_html/base.rb

@@ -6,6 +6,9 @@ module AutoHtml
   def auto_html(raw, &proc)
     return "" if raw.blank?
     builder = Builder.new(raw)
-    builder.instance_eval(&proc)
+    result = builder.instance_eval(&proc)
+    result.respond_to?(:html_safe) ?
+      result.html_safe :
+        result
   end
 end

data/lib/auto_html/filters/image.rb

@@ -1,5 +1,7 @@
-AutoHtml.add_filter(:image) do |text|
+require 'tag_helper'
+
+AutoHtml.add_filter(:image).with({:alt => ''}) do |text, options|
   text.gsub(/https?:\/\/.+\.(jpg|jpeg|bmp|gif|png)(\?\S+)?/i) do |match|
-    %|<img src="#{match}" alt=""/>|
+    TagHelper.image_tag(match, options)
   end
 end

data/lib/auto_html/filters/link.rb

@@ -1,5 +1,6 @@
-require 'action_view'
+require 'rinku'
+require 'tag_helper'
 
 AutoHtml.add_filter(:link).with({}) do |text, options|
-  ActionView::Base.new.auto_link(text, :html => options, :sanitize => false)
+  Rinku.auto_link(text, :all, TagHelper.attributes(options))
 end

data/lib/auto_html.rb

@@ -6,6 +6,11 @@ Dir["#{File.dirname(__FILE__) + '/auto_html/filters'}/**/*"].each do |filter|
   require "#{filter}"
 end
 
+# if rails
 if defined?(ActiveRecord::Base)
   ActiveRecord::Base.send :include, AutoHtmlFor
+
+  module ActionView::Helpers::TextHelper
+    include AutoHtml
+  end
 end

data/test/functional/auto_html_for_test.rb

@@ -6,7 +6,7 @@ class Article < ActiveRecord::Base
     html_escape
     youtube(:width => 400, :height => 250)
     image
-    link(:target => "_blank", :rel => "nofollow")
+    link(:target => "_blank")
     simple_format
   end
 end
@@ -19,6 +19,12 @@ class AutoHtmlForTest < Test::Unit::TestCase
     assert_equal '<p>Yo!</p>', @article.body_html
   end
 
+  def test_html_safe
+    return unless "".respond_to?(:html_safe?)
+    @article = Article.new(:body => 'Yo!')
+    assert @article.body_html.html_safe?
+  end
+
   def test_transform_after_save
     @article = Article.new(:body => 'Yo!')
     @article.save!
@@ -35,6 +41,6 @@ class AutoHtmlForTest < Test::Unit::TestCase
     @article = Article.create!(:body => 'Yo!')
     @article.update_attributes(:body => 'http://vukajlija.com')
     @article.save!
-    assert_equal '<p><a href="http://vukajlija.com" rel="nofollow" target="_blank">http://vukajlija.com</a></p>', @article.body_html
+    assert_equal '<p><a href="http://vukajlija.com" target="_blank">http://vukajlija.com</a></p>', @article.body_html
   end
 end

data/test/unit/auto_html_test.rb

@@ -14,27 +14,27 @@ class AutoHtmlTest < Test::Unit::TestCase
   end
 
   def test_should_apply_simple_format_and_image_filter
-    result = auto_html("Check the logo: http://rors.org/images/rails.png") { simple_format; image }
-    assert_equal '<p>Check the logo: <img src="http://rors.org/images/rails.png" alt=""/></p>', result
+    result = auto_html("Check the logo: http://rors.org/images/rails.png") { simple_format; image(:alt => nil) }
+    assert_equal '<p>Check the logo: <img src="http://rors.org/images/rails.png" /></p>', result
   end
 
   def test_should_apply_simple_format_image_and_link_filter
-    result = auto_html("Check the logo: http://rors.org/images/rails.png. Visit: http://rubyonrails.org") { simple_format; image; link }
-    assert_equal '<p>Check the logo: <img src="http://rors.org/images/rails.png" alt=""/>. Visit: <a href="http://rubyonrails.org">http://rubyonrails.org</a></p>', result
+    result = auto_html("Check the logo: http://rors.org/images/rails.png. Visit: http://rubyonrails.org") { simple_format; image(:alt => nil); link }
+    assert_equal '<p>Check the logo: <img src="http://rors.org/images/rails.png" />. Visit: <a href="http://rubyonrails.org" >http://rubyonrails.org</a></p>', result
   end
   
   def test_should_apply_simple_format_image_and_redcloth_and_link_filter
-    result = auto_html('Check the logo: http://rors.org/images/rails.png. Visit: http://rubyonrails.org and "Read the Guides":http://guides.rubyonrails.org/') { simple_format; image; redcloth; link }
-    assert_equal '<p>Check the logo: <img src="http://rors.org/images/rails.png" alt=""/>. Visit: <a href="http://rubyonrails.org">http://rubyonrails.org</a> and <a href="http://guides.rubyonrails.org/">Read the Guides</a></p>', result
+    result = auto_html('Check the logo: http://rors.org/images/rails.png. Visit: http://rubyonrails.org and "Read the Guides":http://guides.rubyonrails.org/') { simple_format; image(:alt => nil); redcloth; link }
+    assert_equal '<p>Check the logo: <img src="http://rors.org/images/rails.png" />. Visit: <a href="http://rubyonrails.org" >http://rubyonrails.org</a> and <a href="http://guides.rubyonrails.org/">Read the Guides</a></p>', result
   end
 
   def test_should_return_blank_if_input_is_blank
-    result = auto_html("") { simple_format; image; link }
+    result = auto_html("") { simple_format; image(:alt => nil); link }
     assert_equal "", result
   end
   
   def test_should_not_apply_simple_format_if_input_is_nil
-    result = auto_html(nil) { simple_format; image; link }
+    result = auto_html(nil) { simple_format; image(:alt => nil); link }
     assert_equal "", result
   end
 

data/test/unit/filters/image_test.rb

@@ -3,8 +3,8 @@ require File.expand_path('../../unit_test_helper', __FILE__)
 class ImageTest < Test::Unit::TestCase
 
   def test_transform
-    result = auto_html('http://rors.org/images/rails.png') { image }
-    assert_equal '<img src="http://rors.org/images/rails.png" alt=""/>', result
+    result = auto_html('http://rors.org/images/rails.png') { image({:alt => nil}) }
+    assert_equal '<img src="http://rors.org/images/rails.png" />', result
   end
 
   def test_dont_transform
@@ -13,38 +13,38 @@ class ImageTest < Test::Unit::TestCase
   end
 
   def test_transform2
-    result = auto_html('http://farm4.static.flickr.com/3459/3270173112_5099d3d730.jpg') { image }
-    assert_equal '<img src="http://farm4.static.flickr.com/3459/3270173112_5099d3d730.jpg" alt=""/>', result
+    result = auto_html('http://farm4.static.flickr.com/3459/3270173112_5099d3d730.jpg') { image({:alt => nil}) }
+    assert_equal '<img src="http://farm4.static.flickr.com/3459/3270173112_5099d3d730.jpg" />', result
   end
 
   def test_transform3
-    result = auto_html('http://www.lockhartfineart.com/images/Rio_Grande_Frost.JPG') { image }
-    assert_equal '<img src="http://www.lockhartfineart.com/images/Rio_Grande_Frost.JPG" alt=""/>', result
+    result = auto_html('http://www.lockhartfineart.com/images/Rio_Grande_Frost.JPG') { image({:alt => nil}) }
+    assert_equal '<img src="http://www.lockhartfineart.com/images/Rio_Grande_Frost.JPG" />', result
   end
 
   def test_transform4
-    result = auto_html('http://www.lockhartfineart.com/images/Rio_Grande_Frost.JPG') { image }
-    assert_equal '<img src="http://www.lockhartfineart.com/images/Rio_Grande_Frost.JPG" alt=""/>', result
+    result = auto_html('http://www.lockhartfineart.com/images/Rio_Grande_Frost.JPG') { image({:alt => nil}) }
+    assert_equal '<img src="http://www.lockhartfineart.com/images/Rio_Grande_Frost.JPG" />', result
   end
 
   def test_transform5
-    result = auto_html('http://farm4.static.flickr.com/3664/3512431377_71b8d002ef.jpg?v=0') { image }
-    assert_equal '<img src="http://farm4.static.flickr.com/3664/3512431377_71b8d002ef.jpg?v=0" alt=""/>', result
+    result = auto_html('http://farm4.static.flickr.com/3664/3512431377_71b8d002ef.jpg?v=0') { image({:alt => nil}) }
+    assert_equal '<img src="http://farm4.static.flickr.com/3664/3512431377_71b8d002ef.jpg?v=0" />', result
   end
 
   def test_transform6
-    result = auto_html('Do you like this logo http://rors.org/images/rails.png? Yeah?') { image }
-    assert_equal 'Do you like this logo <img src="http://rors.org/images/rails.png" alt=""/>? Yeah?', result
+    result = auto_html('Do you like this logo http://rors.org/images/rails.png? Yeah?') { image({:alt => nil}) }
+    assert_equal 'Do you like this logo <img src="http://rors.org/images/rails.png" />? Yeah?', result
   end
 
   def test_transform7
-    result = auto_html('http://tbn3.google.com/images?q=tbn:vS-jtEi9Xc8K6M:http://upload.wikimedia.org/wikipedia/commons/b/ba/Potturinn.jpeg') { image }
-    assert_equal '<img src="http://tbn3.google.com/images?q=tbn:vS-jtEi9Xc8K6M:http://upload.wikimedia.org/wikipedia/commons/b/ba/Potturinn.jpeg" alt=""/>', result
+    result = auto_html('http://tbn3.google.com/images?q=tbn:vS-jtEi9Xc8K6M:http://upload.wikimedia.org/wikipedia/commons/b/ba/Potturinn.jpeg') { image({:alt => nil}) }
+    assert_equal '<img src="http://tbn3.google.com/images?q=tbn:vS-jtEi9Xc8K6M:http://upload.wikimedia.org/wikipedia/commons/b/ba/Potturinn.jpeg" />', result
   end
 
   def test_https
-    result = auto_html('https://img.skitch.com/20100910-1wrbg5749xe29ya5t3s85bnaiy.png') { image }
-    assert_equal '<img src="https://img.skitch.com/20100910-1wrbg5749xe29ya5t3s85bnaiy.png" alt=""/>', result
+    result = auto_html('https://img.skitch.com/20100910-1wrbg5749xe29ya5t3s85bnaiy.png') { image({:alt => nil}) }
+    assert_equal '<img src="https://img.skitch.com/20100910-1wrbg5749xe29ya5t3s85bnaiy.png" />', result
   end
 
 end

data/test/unit/filters/link_test.rb

@@ -4,49 +4,43 @@ class LinkTest < Test::Unit::TestCase
 
   def test_transform
     result = auto_html("http://vukajlija.com") { link }
-    assert_equal '<a href="http://vukajlija.com">http://vukajlija.com</a>', result
+    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
+    assert_equal '<a href="http://github.com/" >http://github.com/</a>', result
   end
 
   def test_transform_with_param
     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
+    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
+    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
-    url = 'http://www.youtube.com/watch?v=s5C5Zk4kobo&feature=related'
-    # uses auto_link instead raw to support both Rails 2 & 3
-    assert_equal(ActionView::Base.new.auto_link(url), auto_html(url) { 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_commas
     result = auto_html('http://www.dw-world.de/dw/article/0,,4708386,00.html?maca=ser-rss-ser-all-1494-rdf') { link }
-    assert_equal '<a href="http://www.dw-world.de/dw/article/0,,4708386,00.html?maca=ser-rss-ser-all-1494-rdf">http://www.dw-world.de/dw/article/0,,4708386,00.html?maca=ser-rss-ser-all-1494-rdf</a>', result
+    assert_equal '<a href="http://www.dw-world.de/dw/article/0,,4708386,00.html?maca=ser-rss-ser-all-1494-rdf" >http://www.dw-world.de/dw/article/0,,4708386,00.html?maca=ser-rss-ser-all-1494-rdf</a>', result
   end
 
   def test_transform_complex_url
     url = 'http://www.google.com/#q=nikola+tesla&ct=tesla09&oi=ddle&fp=Xmf0jJ9P_V0'
     # uses auto_link instead raw to support both Rails 2 & 3
-    assert_equal(ActionView::Base.new.auto_link(url), auto_html(url) { link })
+    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>', auto_html(url) { link })
   end
 
   def test_transform_with_options
-    result = auto_html("http://rors.org") { link :rel => "nofollow", :target => "_blank" }
-    assert_equal '<a href="http://rors.org" rel="nofollow" target="_blank">http://rors.org</a>', result
+    result = auto_html("http://rors.org") { link :target => "_blank" }
+    assert_equal '<a href="http://rors.org" target="_blank">http://rors.org</a>', result
   end
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: auto_html
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 7
   prerelease: false
   segments: 
   - 1
-  - 3
-  - 7
-  version: 1.3.7
+  - 4
+  - 0
+  version: 1.4.0
 platform: ruby
 authors: 
 - Dejan Simic
@@ -15,11 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-12 00:00:00 +02:00
+date: 2011-07-09 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: RedCloth
+  name: rinku
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -32,6 +32,34 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: tag_helper
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: RedCloth
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id003
 description: Automatically transforms URIs (via domain) and includes the destination resource (Vimeo, YouTube movie, image, ...) in your document
 email: desimic@gmail.com
 executables: []