auto_html 1.3.4 → 1.3.5

data/README.md

@@ -71,8 +71,6 @@ As from version 1.2.0 auto_html uses Rails' engine for discovering links. There
     for Rails <= 2.3.1 use auto_html 1.1.2<br/>
     for Rails >= 2.3.2 use the latest auto_html
 
-As of version 1.3.0, auto_html has been tested to work with Rails 3 and Ruby 1.9.
-
 ### As a gem
 
 To enable the library in your Rails 2.1-2.3 project, use the gem configuration method in "config/environment.rb"
@@ -93,4 +91,4 @@ In Rails 3.0 specify the gem in your Gemfile
 ## 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)
+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)

data/lib/auto_html/filters/image.rb

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

data/lib/auto_html/filters/redcloth.rb

@@ -0,0 +1,9 @@
+require 'redcloth'
+
+AutoHtml.add_filter(:redcloth).with({}) do |text, options|
+  result = RedCloth.new(text).to_html
+  if options and options[:target] and options[:target].to_sym == :_blank
+    result.gsub!(/<a/,'<a target="_blank"')
+  end
+  result
+end

data/lib/auto_html.rb

@@ -1,8 +1,7 @@
 %w(base filter builder auto_html_for).each do |f|
-  require File.dirname(__FILE__) + "/auto_html/#{f}"
+  require File.expand_path("../auto_html/#{f}", __FILE__)
 end
 
-# Register built-in filters
 Dir["#{File.dirname(__FILE__) + '/auto_html/filters'}/**/*"].each do |filter|
   require "#{filter}"
 end

data/test/functional/auto_html_for_options_test.rb

@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../test_helper'
-require File.dirname(__FILE__) + '/../fixture_setup'
+require File.expand_path('../../test_helper', __FILE__)
+require File.expand_path('../../fixture_setup', __FILE__)
 
 # store default so we can revert so that other tests use default option
 default_suffix = AutoHtmlFor.auto_html_for_options[:htmlized_attribute_suffix]
@@ -11,7 +11,7 @@ class Article < ActiveRecord::Base
   end
 end
 
-class AutoHtmlForTest < Test::Unit::TestCase
+class AutoHtmlForOptionsTest < Test::Unit::TestCase
   include FixtureSetup
 
   def test_transform_after_save

data/test/functional/auto_html_for_test.rb

@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../test_helper'
-require File.dirname(__FILE__) + '/../fixture_setup'
+require File.expand_path('../../test_helper', __FILE__)
+require File.expand_path('../../fixture_setup', __FILE__)
 
 class Article < ActiveRecord::Base
   auto_html_for :body do

data/test/functional/filter_test.rb

@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../test_helper'
-require File.dirname(__FILE__) + '/../fixture_setup'
+require File.expand_path('../../test_helper', __FILE__)
+require File.expand_path('../../fixture_setup', __FILE__)
 
 AutoHtml.add_filter(:foo) do |text|
   nil
@@ -17,7 +17,7 @@ class User < ActiveRecord::Base
   end
 end
 
-class AutoHtmlForTest < Test::Unit::TestCase
+class FilterTest < Test::Unit::TestCase
   include FixtureSetup
 
   def test_transform_after_save

data/test/unit/auto_html_test.rb

@@ -1,4 +1,5 @@
-require File.dirname(__FILE__) + '/unit_test_helper'
+require File.expand_path('../unit_test_helper', __FILE__)
+
 
 class AutoHtmlTest < Test::Unit::TestCase
 
@@ -22,6 +23,11 @@ class AutoHtmlTest < Test::Unit::TestCase
     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
   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
+  end
+
   def test_should_return_blank_if_input_is_blank
     result = auto_html("") { simple_format; image; link }
     assert_equal "", result

data/test/unit/filters/dailymotion_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../unit_test_helper'
+require File.expand_path('../../unit_test_helper', __FILE__)
 
 class DailyMotionTest < Test::Unit::TestCase
 

data/test/unit/filters/google_video_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../unit_test_helper'
+require File.expand_path('../../unit_test_helper', __FILE__)
 
 class GoogleVideoTest < Test::Unit::TestCase
 

data/test/unit/filters/html_escape_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../unit_test_helper'
+require File.expand_path('../../unit_test_helper', __FILE__)
 
 class HtmlEscapeTest < Test::Unit::TestCase
 

data/test/unit/filters/image_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../unit_test_helper'
+require File.expand_path('../../unit_test_helper', __FILE__)
 
 class ImageTest < Test::Unit::TestCase
 
@@ -42,4 +42,9 @@ class ImageTest < Test::Unit::TestCase
     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
   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
+  end
+
 end

data/test/unit/filters/link_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../unit_test_helper'
+require File.expand_path('../../unit_test_helper', __FILE__)
 
 class LinkTest < Test::Unit::TestCase
 

data/test/unit/filters/metacafe_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../unit_test_helper'
+require File.expand_path('../../unit_test_helper', __FILE__)
 
 class MetaCafeTest < Test::Unit::TestCase
 

data/test/unit/filters/redcloth_test.rb

@@ -0,0 +1,25 @@
+require File.expand_path('../../unit_test_helper', __FILE__)
+
+class RedClothTest < Test::Unit::TestCase
+
+  def test_transform_strong
+    result = auto_html("This is *my* text.") { redcloth }
+    assert_equal '<p>This is <strong>my</strong> text.</p>', result
+  end
+
+  def test_transform_title
+    result = auto_html("h2. This is a title") { redcloth }
+    assert_equal '<h2>This is a title</h2>', result
+  end
+
+  def test_transform_link
+    result = auto_html('"This is a link (This is a title)":http://www.textism.com') { redcloth }
+    assert_equal '<p><a href="http://www.textism.com" title="This is a title">This is a link</a></p>', result
+  end
+
+  def test_transform_link_target_blank
+    result = auto_html('"This is a link (This is a title)":http://www.textism.com') { redcloth :target => :_blank }
+    assert_equal '<p><a target="_blank" href="http://www.textism.com" title="This is a title">This is a link</a></p>', result
+  end
+
+end

data/test/unit/filters/sanitize_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../unit_test_helper'
+require File.expand_path('../../unit_test_helper', __FILE__)
 
 class SanitizeTest < Test::Unit::TestCase
 

data/test/unit/filters/simple_format_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../unit_test_helper'
+require File.expand_path('../../unit_test_helper', __FILE__)
 
 class SimpleFormatTest < Test::Unit::TestCase
 

data/test/unit/filters/vimeo_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../unit_test_helper'
+require File.expand_path('../../unit_test_helper', __FILE__)
 
 class VimeoTest < Test::Unit::TestCase
 

data/test/unit/filters/youtube_js_api_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../unit_test_helper'
+require File.expand_path('../../unit_test_helper', __FILE__)
 
 class YouTubeJsApiTest < Test::Unit::TestCase
   

data/test/unit/filters/youtube_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../unit_test_helper'
+require File.expand_path('../../unit_test_helper', __FILE__)
 
 class YouTubeTest < Test::Unit::TestCase
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: auto_html
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 1
   - 3
-  - 4
-  version: 1.3.4
+  - 5
+  version: 1.3.5
 platform: ruby
 authors: 
 - Dejan Simic
@@ -15,10 +15,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-01 00:00:00 +01:00
+date: 2011-03-30 00:00:00 +02:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: redcloth
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id001
 description: Automatically transforms URIs (via domain) and includes the destination resource (Vimeo, YouTube movie, image, ...) in your document
 email: desimic@gmail.com
 executables: []
@@ -39,6 +52,7 @@ files:
 - lib/auto_html/filters/image.rb
 - lib/auto_html/filters/link.rb
 - lib/auto_html/filters/metacafe.rb
+- lib/auto_html/filters/redcloth.rb
 - lib/auto_html/filters/sanitize.rb
 - lib/auto_html/filters/simple_format.rb
 - lib/auto_html/filters/vimeo.rb
@@ -59,6 +73,7 @@ files:
 - test/unit/filters/image_test.rb
 - test/unit/filters/link_test.rb
 - test/unit/filters/metacafe_test.rb
+- test/unit/filters/redcloth_test.rb
 - test/unit/filters/sanitize_test.rb
 - test/unit/filters/simple_format_test.rb
 - test/unit/filters/vimeo_test.rb