auto_html 1.6.0 → 1.6.1

data/README.md

@@ -1,8 +1,8 @@
-auto_html [![Build Status](https://secure.travis-ci.org/dejan/auto_html.png)](http://travis-ci.org/dejan/auto_html)
+auto_html [![Build Status](https://secure.travis-ci.org/dejan/auto_html.png?branch=master)](http://travis-ci.org/dejan/auto_html)
 =========
 
 
-auto_html is a Rails extension for transforming URLs to appropriate resource (image, link, YouTube, Vimeo video,...). It's the perfect choice if you don't want to bother visitors with rich HTML editor or markup code, but you still want to allow them to embed video, images, links and more on your site, purely by pasting URL. Check out the [live demo](http://auto-html.rors.org).
+auto_html is a Rails extension for transforming URLs to appropriate resource (image, link, YouTube, Vimeo video,...). It's the perfect choice if you don't want to bother visitors with rich HTML editor or markup code, but you still want to allow them to embed video, images, links and more on your site, purely by pasting URL. Check out the [live demo](http://rors.org/demos/auto_html).
 
 
 ## Install
@@ -27,7 +27,7 @@ You'll probably have user input stored in model, so it's a good place to automat
       auto_html_for :body do
         html_escape
         image
-        youtube(:width => 400, :height => 250)
+        youtube(:width => 400, :height => 250, :autoplay => true)
         link :target => "_blank", :rel => "nofollow"
         simple_format
       end
@@ -120,4 +120,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -7,14 +7,3 @@ desc 'Test AutoHtml'
 Rake::TestTask.new(:test) do |t|
   t.pattern = 'test/**/*_test.rb'
 end
-
-desc 'Test with versions of Rails available on the system'
-task :test_with_installed do
-  versions = `gem list rails | grep rails`.gsub("rails (", "").chop.chop.split(', ')
-  exclude = []
-  (versions-exclude).each do |v|
-    puts "\n###### TESTING WITH RAILS #{v}"
-    ENV['RAILS_VERSION'] = v
-    Rake::Task['test'].execute
-  end
-end

data/lib/auto_html/auto_html_for.rb

@@ -1,3 +1,7 @@
+require 'rails'
+
+require 'active_support/core_ext/module/attribute_accessors' if Rails::VERSION::MAJOR >= 4
+
 module AutoHtmlFor
 
   # default options that can be overridden on the global level
@@ -14,6 +18,10 @@ module AutoHtmlFor
     def auto_html_for(raw_attrs, &proc)
       include AutoHtmlFor::InstanceMethods
 
+      if defined?(ActiveRecord) == "constant"
+        return unless ActiveRecord::Base.connection.table_exists? self.table_name
+      end
+
       suffix =  AutoHtmlFor.auto_html_for_options[:htmlized_attribute_suffix]
       auto_html_for_columns = [raw_attrs].flatten.map { |a| "#{a}#{suffix}" }
       
@@ -24,7 +32,7 @@ module AutoHtmlFor
       missing_cache_columns.each do |missing_cache_column|
         raw_attr = missing_cache_column.gsub(suffix, '')
         define_method(missing_cache_column) do
-          val = self[raw_attr]
+          val = self[raw_attr] || self.send(raw_attr.to_sym)
           auto_html(val, &proc)
         end
       end

data/lib/auto_html/filters/dailymotion.rb

@@ -3,4 +3,4 @@ AutoHtml.add_filter(:dailymotion).with(:width => 480, :height => 360) do |text,
     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
+end

data/lib/auto_html/filters/gist.rb

@@ -1,9 +1,8 @@
 AutoHtml.add_filter(:gist).with({}) do |text, options|
   # E.g. https://gist.github.com/1710276
-  regex = /https:\/\/gist\.github\.com\/(\d+)/
+  regex = %r{https?://gist\.github\.com/(\w+/)?(\d+)}
   text.gsub(regex) do
-    gist_id = $1
+    gist_id = $2
     %{<script src="https://gist.github.com/#{gist_id}.js"></script>}
   end
 end
-

data/lib/auto_html/filters/google_map.rb

@@ -1,13 +1,19 @@
 # encoding: UTF-8
-AutoHtml.add_filter(:google_map).with(:width => 420, :height => 315, :style => "color:#000;text-align:left", :link_text => "View Larger Map") do |text, options|
-  regex = /(https?):\/\/maps\.google\.co(.*)\/maps\?(.*)/
+AutoHtml.add_filter(:google_map).with(:width => 420, :height => 315, :style => "color:#000;text-align:left", :link_text => "View Larger Map", :show_info => true, :type => :normal, :zoom => 18, :more => '') do |text, options|
+  map_type = { :normal => '&t=m', :satellite => '&t=k', :terrain => '&t=p', :hibrid => '&t=h' }
+  regex = /(https?):\/\/maps\.google\.([a-z\.]+)\/maps\?(.*)/
   text.gsub(regex) do
     domain_country = $2
     map_query = $3
     width = options[:width]
     height = options[:height]
     style = options[:style]
-		link_text = options[:link_text]
-    %{<iframe width="#{width}" height="#{height}" frameborder="0" scrolling="no" marginheight="0" marginwidth="0" src="//maps.google.co#{domain_country}/maps?f=q&amp;source=s_q&amp;#{map_query}&amp;output=embed"></iframe><br /><small><a href="//maps.google.co#{domain_country}/maps?f=q&amp;source=embed&amp;#{map_query}" style="#{style}">#{link_text}</a></small>}
+    link_text = options[:link_text]
+    type = options[:type].to_sym
+    map_options = (options[:show_info] ? '' : '&amp;iwloc=near')
+    map_options << map_type[type] if map_type.has_key?(type)
+    map_options << "&amp;z=#{options[:zoom]}"
+    map_options << options[:more]
+    %{<iframe width="#{width}" height="#{height}" frameborder="0" scrolling="no" marginheight="0" marginwidth="0" src="//maps.google.#{domain_country}/maps?f=q&amp;source=s_q&amp;#{map_query}&amp;output=embed#{map_options}"></iframe><br /><small><a href="//maps.google.#{domain_country}/maps?f=q&amp;source=embed&amp;#{map_query}" style="#{style}">#{link_text}</a></small>}
   end
 end

data/lib/auto_html/filters/google_video.rb

@@ -1,6 +1,6 @@
-AutoHtml.add_filter(:google_video).with(:width => 650, :height => 391) do |text, options|
-  text.gsub(/http:\/\/video\.google\.com\/videoplay\?docid\=(-?[0-9]*)[&\w;=\+_\-]*/) do
-    docid = $1
-    %{<object width="#{options[:width]}" height="#{options[:height]}"><param name="movie" value="http://video.google.com/googleplayer.swf?docid=#{docid}&hl=en&fs=true"></param><param name="wmode" value="transparent"></param><embed src="http://video.google.com/googleplayer.swf?docid=#{docid}" type="application/x-shockwave-flash" wmode="transparent" width="#{options[:width]}" height="#{options[:height]}"></embed></object>}
-  end
-end
+# GoogleVideo is discontinued so don't do anything
+# TODO Remove this filter in auto_html v2.0
+AutoHtml.add_filter(:google_video) do |text, options|
+  text
+end
+

data/lib/auto_html/filters/hashtag.rb

@@ -0,0 +1,7 @@
+AutoHtml.add_filter(:hashtag).with(:source => :twitter) do |text, options|
+  if options[:source] == :twitter
+    text.gsub(/#([^ ]+)/, '<a href="http://twitter.com/search?q=%23\1&f=realtime" class="hashtag" target="_blank">#\1</a>')
+  elsif options[:source] == :facebook
+    text.gsub(/#([^ ]+)/, '<a href="https://www.facebook.com/hashtag/\1" class="hashtag" target="_blank">#\1</a>')
+  end
+end

data/lib/auto_html/filters/image.rb

@@ -3,13 +3,14 @@ require 'redcarpet'
 class NoParagraphRenderer < ::Redcarpet::Render::XHTML
   def paragraph(text)
     text
-  end    
+  end
 end
 
 AutoHtml.add_filter(:image).with({:alt => ''}) do |text, options|
   r = Redcarpet::Markdown.new(NoParagraphRenderer)
   alt = options[:alt]
-  text.gsub(/https?:\/\/.+?\.(jpg|jpeg|bmp|gif|png)(\?\S+)?/i) do |match|
-    r.render("![#{alt}](#{match})")
+  options[:proxy] ||= ""
+  text.gsub(/(?<!src=")https?:\/\/.+?\.(jpg|jpeg|bmp|gif|png)(\?\S+)?/i) do |match|
+    r.render("![#{alt}](#{options[:proxy]}#{match})")
   end
-end
+end

data/lib/auto_html/filters/link.rb

@@ -1,7 +1,17 @@
+require 'uri'
 require 'rinku'
 require 'rexml/document'
 
 AutoHtml.add_filter(:link).with({}) do |text, options|
+  option_short_link_name = options.delete(:short_link_name)
   attributes = Array(options).reject { |k,v| v.nil? }.map { |k, v| %{#{k}="#{REXML::Text::normalize(v)}"} }.join(' ')
-  Rinku.auto_link(text, :all, attributes)
+  Rinku.auto_link(text, :all, attributes) do |url|
+    if option_short_link_name
+      uri = URI.parse(URI.encode(url.strip))
+      uri.query = nil
+      uri.to_s
+    else
+      url
+    end
+  end
 end

data/lib/auto_html/filters/soundcloud.rb

@@ -1,23 +1,20 @@
+# encoding: UTF-8
 require 'uri'
-require 'net/http'
 
-AutoHtml.add_filter(:soundcloud).with({}) do |text, options|
-  # set these options
-  # :maxwidth => '', :maxheight => '', :auto_play => false, :show_comments => false
-  text.gsub(/(https?:\/\/)?(www.)?soundcloud\.com\/.*/) do |match|
+# set these options and default values
+# :width => '100%', :height => 166, :auto_play => false, :theme_color => '00FF00', :color => '915f33', :show_comments => false
+AutoHtml.add_filter(:soundcloud).with(:width => '100%', :height => 166, :auto_play => false, :theme_color => '00FF00', :color => '915f33', :show_comments => false, :show_artwork => false) do |text, options|
+  text.gsub(/(https?:\/\/)?(www.)?soundcloud\.com\/\S*/) do |match|
     new_uri = match.to_s
     new_uri = (new_uri =~ /^https?\:\/\/.*/) ? URI(new_uri) : URI("http://#{new_uri}")
     new_uri.normalize!
-
-    uri = URI("http://soundcloud.com/oembed")
-    params = {:format => 'json', :url => new_uri}.merge(options)
-    uri.query = params.collect { |k,v| "#{k}=#{CGI::escape(v.to_s)}" }.join('&')
-    response = Net::HTTP.get(uri)
-    if !response.blank?
-      JSON.parse(response)["html"]
-    else
-      match
-    end
+    width = options[:width]
+    height = options[:height]
+    auto_play = options[:auto_play]
+    theme_color = options[:theme_color]
+    color = options[:color]
+    show_artwork = options[:show_artwork]
+    show_comments = options[:show_comments]
+    %{<iframe width="#{width}" height="#{height}" scrolling="no" frameborder="no" src="http://w.soundcloud.com/player/?url=#{new_uri}&show_artwork=#{show_artwork}&show_comments=#{show_comments}&auto_play=#{auto_play}&color=#{color}&theme_color=#{theme_color}"></iframe>}
   end
 end
-

data/lib/auto_html/filters/twitter.rb

@@ -2,7 +2,7 @@ require 'uri'
 require 'net/http'
 
 AutoHtml.add_filter(:twitter).with({}) do |text, options|
-  regex = %r{https://twitter\.com(/#!)?/[A-Za-z0-9_]{1,15}/status(es)?/\d+}
+  regex = %r{(?<!href=")https://twitter\.com(/#!)?/[A-Za-z0-9_]{1,15}/status(es)?/\d+}
 
   text.gsub(regex) do |match|
     params = { :url => match }.merge(options)

data/lib/auto_html/filters/worldstar.rb

@@ -0,0 +1,8 @@
+AutoHtml.add_filter(:worldstar).with(:width => 448, :height => 374) do |text,options|
+    text.gsub(/http:\/\/www\.worldstarhiphop\.com\/videos\/video\.php\?v\=(wshh[A-Za-z0-9]+)/) do 
+      video_id = $1
+      width  = options[:width]
+      height = options[:height]
+      %{<object width="#{width}" height="#{height}"><param name="movie" value="http://www.worldstarhiphop.com/videos/e/16711680/#{video_id}"><param name="allowFullScreen" value="true"></param><embed src="http://www.worldstarhiphop.com/videos/e/16711680/#{video_id}" type="application/x-shockwave-flash" allowFullscreen="true" width="#{width}" height="#{height}"></embed></object>}
+    end
+end

data/lib/auto_html/filters/youtube.rb

@@ -1,14 +1,19 @@
-AutoHtml.add_filter(:youtube).with(:width => 420, :height => 315, :frameborder => 0, :wmode => nil) do |text, options|
-  regex = /https?:\/\/(www.)?(youtube\.com\/watch\?v=|youtu\.be\/|youtube\.com\/watch\?feature=player_embedded&v=)([A-Za-z0-9_-]*)(\&\S+)?(\S)*/
+AutoHtml.add_filter(:youtube).with(:width => 420, :height => 315, :frameborder => 0, :wmode => nil, :autoplay => false, :hide_related => false) do |text, options|
+  regex = /https?:\/\/(www.)?(youtube\.com\/watch\?v=|youtu\.be\/|youtube\.com\/watch\?feature=player_embedded&v=)([A-Za-z0-9_-]*)(\&\S+)?(\?\S+)?/
   text.gsub(regex) do
     youtube_id = $3
     width = options[:width]
     height = options[:height]
     frameborder = options[:frameborder]
 		wmode = options[:wmode]
+    autoplay = options[:autoplay]
+    hide_related = options[:hide_related]
 		src = "//www.youtube.com/embed/#{youtube_id}"
-		src += "?wmode=#{wmode}" if wmode
+    params = []
+		params << "wmode=#{wmode}" if wmode
+    params << "autoplay=1" if autoplay
+    params << "rel=0" if hide_related
+    src += "?#{params.join '&'}" unless params.empty?
     %{<iframe width="#{width}" height="#{height}" src="#{src}" frameborder="#{frameborder}" allowfullscreen></iframe>}
   end
 end
-

data/test/functional/auto_html_for_test.rb

@@ -9,6 +9,11 @@ class Article < ActiveRecord::Base
     link(:target => "_blank")
     simple_format
   end
+
+  alias_attribute :plain_body, :body
+  auto_html_for :plain_body do
+    html_escape
+  end
 end
 
 class AutoHtmlForTest < Test::Unit::TestCase
@@ -43,4 +48,9 @@ class AutoHtmlForTest < Test::Unit::TestCase
     @article.save!
     assert_equal '<p><a href="http://vukajlija.com" target="_blank">http://vukajlija.com</a></p>', @article.body_html
   end
+
+  def test_transform_of_alias_attribute
+    @article = Article.new(:body => 'Hello there.')
+    assert_equal 'Hello there.', @article.plain_body_html
+  end
 end

data/test/test_helper.rb

@@ -1,12 +1,5 @@
 require 'rubygems'
 
-rails_version = ENV['RAILS_VERSION']
-if rails_version
-  gem "activesupport", rails_version
-  gem "activerecord", rails_version
-  gem "actionpack", rails_version
-end
-
 require 'test/unit'
 require 'active_record'
 require 'active_support/core_ext/class'

data/test/unit/filters/gist_test.rb

@@ -7,4 +7,9 @@ class GistTest < Test::Unit::TestCase
     assert_equal '<script src="https://gist.github.com/1710276.js"></script>', result
   end
 
-end
+  def test_transform_with_username
+    result = auto_html('https://gist.github.com/toctan/6547840') { gist }
+    assert_equal '<script src="https://gist.github.com/6547840.js"></script>', result
+  end
+
+end

data/test/unit/filters/google_map_test.rb

@@ -4,11 +4,21 @@ class GoogleMapTest < Test::Unit::TestCase
 
   def test_transform
     result = auto_html('http://maps.google.co.kr/maps?q=%ED%8C%8C%ED%8A%B8%EB%84%88%EC%8A%A4%ED%83%80%EC%9B%8C+1%EC%B0%A8&hl=ko&ie=UTF8&ll=37.472942,126.884762&spn=0.00774,0.010053&sll=37.473027,126.88451&sspn=0.003887,0.005026&vpsrc=6&gl=kr&hq=%ED%8C%8C%ED%8A%B8%EB%84%88%EC%8A%A4%ED%83%80%EC%9B%8C+1%EC%B0%A8&t=m&z=17&iwloc=A') { google_map }
-    assert_equal '<iframe width="420" height="315" frameborder="0" scrolling="no" marginheight="0" marginwidth="0" src="//maps.google.co.kr/maps?f=q&amp;source=s_q&amp;q=%ED%8C%8C%ED%8A%B8%EB%84%88%EC%8A%A4%ED%83%80%EC%9B%8C+1%EC%B0%A8&hl=ko&ie=UTF8&ll=37.472942,126.884762&spn=0.00774,0.010053&sll=37.473027,126.88451&sspn=0.003887,0.005026&vpsrc=6&gl=kr&hq=%ED%8C%8C%ED%8A%B8%EB%84%88%EC%8A%A4%ED%83%80%EC%9B%8C+1%EC%B0%A8&t=m&z=17&iwloc=A&amp;output=embed"></iframe><br /><small><a href="//maps.google.co.kr/maps?f=q&amp;source=embed&amp;q=%ED%8C%8C%ED%8A%B8%EB%84%88%EC%8A%A4%ED%83%80%EC%9B%8C+1%EC%B0%A8&hl=ko&ie=UTF8&ll=37.472942,126.884762&spn=0.00774,0.010053&sll=37.473027,126.88451&sspn=0.003887,0.005026&vpsrc=6&gl=kr&hq=%ED%8C%8C%ED%8A%B8%EB%84%88%EC%8A%A4%ED%83%80%EC%9B%8C+1%EC%B0%A8&t=m&z=17&iwloc=A" style="color:#000;text-align:left">View Larger Map</a></small>', result
+    assert_equal '<iframe width="420" height="315" frameborder="0" scrolling="no" marginheight="0" marginwidth="0" src="//maps.google.co.kr/maps?f=q&amp;source=s_q&amp;q=%ED%8C%8C%ED%8A%B8%EB%84%88%EC%8A%A4%ED%83%80%EC%9B%8C+1%EC%B0%A8&hl=ko&ie=UTF8&ll=37.472942,126.884762&spn=0.00774,0.010053&sll=37.473027,126.88451&sspn=0.003887,0.005026&vpsrc=6&gl=kr&hq=%ED%8C%8C%ED%8A%B8%EB%84%88%EC%8A%A4%ED%83%80%EC%9B%8C+1%EC%B0%A8&t=m&z=17&iwloc=A&amp;output=embed&amp;t=m&amp;z=18"></iframe><br /><small><a href="//maps.google.co.kr/maps?f=q&amp;source=embed&amp;q=%ED%8C%8C%ED%8A%B8%EB%84%88%EC%8A%A4%ED%83%80%EC%9B%8C+1%EC%B0%A8&hl=ko&ie=UTF8&ll=37.472942,126.884762&spn=0.00774,0.010053&sll=37.473027,126.88451&sspn=0.003887,0.005026&vpsrc=6&gl=kr&hq=%ED%8C%8C%ED%8A%B8%EB%84%88%EC%8A%A4%ED%83%80%EC%9B%8C+1%EC%B0%A8&t=m&z=17&iwloc=A" style="color:#000;text-align:left">View Larger Map</a></small>', result
   end
-  
+
   def test_transform_2
     result = auto_html('http://maps.google.com/maps?hl=en&q=newyork&gs_sm=e&gs_upl=917l917l0l1666l1l1l0l0l0l0l317l317l3-1l1l0&bav=on.2,or.r_gc.r_pw.,cf.osb&biw=1280&bih=679&um=1&ie=UTF-8&sa=N&tab=wl') { google_map }
-    assert_equal '<iframe width="420" height="315" frameborder="0" scrolling="no" marginheight="0" marginwidth="0" src="//maps.google.com/maps?f=q&amp;source=s_q&amp;hl=en&q=newyork&gs_sm=e&gs_upl=917l917l0l1666l1l1l0l0l0l0l317l317l3-1l1l0&bav=on.2,or.r_gc.r_pw.,cf.osb&biw=1280&bih=679&um=1&ie=UTF-8&sa=N&tab=wl&amp;output=embed"></iframe><br /><small><a href="//maps.google.com/maps?f=q&amp;source=embed&amp;hl=en&q=newyork&gs_sm=e&gs_upl=917l917l0l1666l1l1l0l0l0l0l317l317l3-1l1l0&bav=on.2,or.r_gc.r_pw.,cf.osb&biw=1280&bih=679&um=1&ie=UTF-8&sa=N&tab=wl" style="color:#000;text-align:left">View Larger Map</a></small>', result
+    assert_equal '<iframe width="420" height="315" frameborder="0" scrolling="no" marginheight="0" marginwidth="0" src="//maps.google.com/maps?f=q&amp;source=s_q&amp;hl=en&q=newyork&gs_sm=e&gs_upl=917l917l0l1666l1l1l0l0l0l0l317l317l3-1l1l0&bav=on.2,or.r_gc.r_pw.,cf.osb&biw=1280&bih=679&um=1&ie=UTF-8&sa=N&tab=wl&amp;output=embed&amp;t=m&amp;z=18"></iframe><br /><small><a href="//maps.google.com/maps?f=q&amp;source=embed&amp;hl=en&q=newyork&gs_sm=e&gs_upl=917l917l0l1666l1l1l0l0l0l0l317l317l3-1l1l0&bav=on.2,or.r_gc.r_pw.,cf.osb&biw=1280&bih=679&um=1&ie=UTF-8&sa=N&tab=wl" style="color:#000;text-align:left">View Larger Map</a></small>', result
+  end
+
+  def test_show_info
+    result = auto_html('http://maps.google.com.br/maps?q=Joinville+-+Santa+Catarina') { google_map(:show_info => false) }
+    assert_equal '<iframe width="420" height="315" frameborder="0" scrolling="no" marginheight="0" marginwidth="0" src="//maps.google.com.br/maps?f=q&amp;source=s_q&amp;q=Joinville+-+Santa+Catarina&amp;output=embed&amp;iwloc=near&amp;t=m&amp;z=18"></iframe><br /><small><a href="//maps.google.com.br/maps?f=q&amp;source=embed&amp;q=Joinville+-+Santa+Catarina" style="color:#000;text-align:left">View Larger Map</a></small>', result
+  end
+
+  def test_type_and_zoom
+    result = auto_html('http://maps.google.com.br/maps?q=Joinville+-+Santa+Catarina') { google_map(:type => :satellite, :zoom => 3) }
+    assert_equal '<iframe width="420" height="315" frameborder="0" scrolling="no" marginheight="0" marginwidth="0" src="//maps.google.com.br/maps?f=q&amp;source=s_q&amp;q=Joinville+-+Santa+Catarina&amp;output=embed&amp;t=k&amp;z=3"></iframe><br /><small><a href="//maps.google.com.br/maps?f=q&amp;source=embed&amp;q=Joinville+-+Santa+Catarina" style="color:#000;text-align:left">View Larger Map</a></small>', result
   end
 end

data/test/unit/filters/hashtag_test.rb

@@ -0,0 +1,25 @@
+require File.expand_path('../../unit_test_helper', __FILE__)
+
+class HashtagTest < Test::Unit::TestCase
+
+  def test_transform
+    result = auto_html("Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec vel ipsum et leo adipiscing ultrices. Etiam ac elementum cras amet. #LoremIpsum") { hashtag }
+    assert_equal 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec vel ipsum et leo adipiscing ultrices. Etiam ac elementum cras amet. <a href="http://twitter.com/search?q=%23LoremIpsum&f=realtime" class="hashtag" target="_blank">#LoremIpsum</a>', result
+  end
+
+  def test_transform_with_multiple_hashtags
+    result = auto_html("Lorem ipsum #dolor sit amet, consectetur adipiscing elit. Donec vel ipsum et leo #adipiscingUltrices. Etiam ac elementum cras amet.") { hashtag }
+    assert_equal 'Lorem ipsum <a href="http://twitter.com/search?q=%23dolor&f=realtime" class="hashtag" target="_blank">#dolor</a> sit amet, consectetur adipiscing elit. Donec vel ipsum et leo <a href="http://twitter.com/search?q=%23adipiscingUltrices.&f=realtime" class="hashtag" target="_blank">#adipiscingUltrices.</a> Etiam ac elementum cras amet.', result
+  end
+
+  def test_transform_with_twitter_source
+    result = auto_html("Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec vel ipsum et leo adipiscing ultrices. Etiam ac elementum cras amet. #LoremIpsum") { hashtag source: :twitter }
+    assert_equal 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec vel ipsum et leo adipiscing ultrices. Etiam ac elementum cras amet. <a href="http://twitter.com/search?q=%23LoremIpsum&f=realtime" class="hashtag" target="_blank">#LoremIpsum</a>', result
+  end
+
+  def test_transform_with_facebook_source
+    result = auto_html("Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec vel ipsum et leo adipiscing ultrices. Etiam ac elementum cras amet. #LoremIpsum") { hashtag source: :facebook }
+    assert_equal 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec vel ipsum et leo adipiscing ultrices. Etiam ac elementum cras amet. <a href="https://www.facebook.com/hashtag/LoremIpsum" class="hashtag" target="_blank">#LoremIpsum</a>', result
+  end
+
+end

data/test/unit/filters/image_test.rb

@@ -12,6 +12,11 @@ class ImageTest < Test::Unit::TestCase
     assert_equal 'http://blog.phusion.nl/2009/04/16/phusions-one-year-anniversary-gift-phusion-passenger-220/', result
   end
 
+  def test_dont_transform_a_formatted_image
+    result = auto_html('<img src="http://farm4.static.flickr.com/3459/3270173112_5099d3d730.jpg" alt=""/>'){ image({:alt => nil}) }
+    assert_equal '<img src="http://farm4.static.flickr.com/3459/3270173112_5099d3d730.jpg" alt=""/>', result
+  end
+
   def test_transform2
     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" alt=""/>', result
@@ -52,4 +57,9 @@ class ImageTest < Test::Unit::TestCase
     assert_equal '<img src="https://img.skitch.com/20100910-1wrbg5749xe29ya5t3s85bnaiy.png" alt=""/>', result
   end
 
-end
+  def test_proxy_option
+    result = auto_html('http://img.skitch.com/20100910-1wrbg5749xe29ya5t3s85bnaiy.png') { image({:alt => nil,:proxy => "https://proxy/?url="}) }
+    assert_equal '<img src="https://proxy/?url=http://img.skitch.com/20100910-1wrbg5749xe29ya5t3s85bnaiy.png" alt=""/>', result
+  end
+
+end

data/test/unit/filters/link_test.rb

@@ -43,4 +43,13 @@ class LinkTest < Test::Unit::TestCase
     assert_equal '<a href="http://rors.org" target="_blank">http://rors.org</a>', result
   end
 
-end
+  def test_transform_with_short_link_name_option
+    result = auto_html("http://rors.org?some=params&and=more") { link :short_link_name => true }
+    assert_equal '<a href="http://rors.org?some=params&and=more" >http://rors.org</a>', result
+  end
+
+  def test_transform_with_short_link_name_option_false
+    result = auto_html("http://rors.org?some=params&and=more") { link :short_link_name => false }
+    assert_equal '<a href="http://rors.org?some=params&and=more" >http://rors.org?some=params&and=more</a>', result
+  end
+end

data/test/unit/filters/soundcloud_test.rb

@@ -2,37 +2,28 @@ require File.expand_path('../../unit_test_helper', __FILE__)
 require 'fakeweb'
 
 class SoundcloudTest < Test::Unit::TestCase
-  
-  def setup
-    response = '{"version":1.0,"type":"rich","provider_name":"SoundCloud","provider_url":"http://soundcloud.com","height":166,"width":"100%","title":"Flickermood by Forss","description":"From the Soulhack album,\u0026nbsp;recently featured in this ad \u003Ca href=\"https://www.dswshoes.com/tv_commercial.jsp?m=october2007\"\u003Ehttps://www.dswshoes.com/tv_commercial.jsp?m=october2007\u003C/a\u003E ","thumbnail_url":"http://i1.sndcdn.com/artworks-000000001720-91c40a-t500x500.jpg?330b92d","html":"\u003Ciframe width=\"100%\" height=\"166\" scrolling=\"no\" frameborder=\"no\" src=\"http://w.soundcloud.com/player/?url=http%3A%2F%2Fapi.soundcloud.com%2Ftracks%2F293\u0026show_artwork=true\"\u003E\u003C/iframe\u003E","author_name":"Forss","author_url":"http://soundcloud.com/forss"}'
-    FakeWeb.register_uri(:get, %r|http://soundcloud\.com/oembed|, :body => response)
-  end
-  
   def test_transform_url_with_www
     result = auto_html('http://www.soundcloud.com/forss/flickermood') { soundcloud }
-    assert_equal '<iframe width="100%" height="166" scrolling="no" frameborder="no" src="http://w.soundcloud.com/player/?url=http%3A%2F%2Fapi.soundcloud.com%2Ftracks%2F293&show_artwork=true"></iframe>', result
+    assert_equal '<iframe width="100%" height="166" scrolling="no" frameborder="no" src="http://w.soundcloud.com/player/?url=http://www.soundcloud.com/forss/flickermood&show_artwork=false&show_comments=false&auto_play=false&color=915f33&theme_color=00FF00"></iframe>', result
   end
 
   def test_transform_url_without_www
     result = auto_html('http://soundcloud.com/forss/flickermood') { soundcloud }
-    assert_equal '<iframe width="100%" height="166" scrolling="no" frameborder="no" src="http://w.soundcloud.com/player/?url=http%3A%2F%2Fapi.soundcloud.com%2Ftracks%2F293&show_artwork=true"></iframe>', result
+    assert_equal '<iframe width="100%" height="166" scrolling="no" frameborder="no" src="http://w.soundcloud.com/player/?url=http://soundcloud.com/forss/flickermood&show_artwork=false&show_comments=false&auto_play=false&color=915f33&theme_color=00FF00"></iframe>', result
   end
 
   def test_transform_url_without_protocol
     result = auto_html('soundcloud.com/forss/flickermood') { soundcloud }
-    assert_equal '<iframe width="100%" height="166" scrolling="no" frameborder="no" src="http://w.soundcloud.com/player/?url=http%3A%2F%2Fapi.soundcloud.com%2Ftracks%2F293&show_artwork=true"></iframe>', result
+    assert_equal '<iframe width="100%" height="166" scrolling="no" frameborder="no" src="http://w.soundcloud.com/player/?url=http://soundcloud.com/forss/flickermood&show_artwork=false&show_comments=false&auto_play=false&color=915f33&theme_color=00FF00"></iframe>', result
   end
 
   def test_transform_url_with_ssl
     result = auto_html('https://soundcloud.com/forss/flickermood') { soundcloud }
-    assert_equal '<iframe width="100%" height="166" scrolling="no" frameborder="no" src="http://w.soundcloud.com/player/?url=http%3A%2F%2Fapi.soundcloud.com%2Ftracks%2F293&show_artwork=true"></iframe>', result
+    assert_equal '<iframe width="100%" height="166" scrolling="no" frameborder="no" src="http://w.soundcloud.com/player/?url=https://soundcloud.com/forss/flickermood&show_artwork=false&show_comments=false&auto_play=false&color=915f33&theme_color=00FF00"></iframe>', result
   end
 
   def test_transform_url_with_options
-    response = '{"version":1.0,"type":"rich","provider_name":"SoundCloud","provider_url":"http://soundcloud.com","height":100,"width":100,"title":"Flickermood by Forss","description":"From the Soulhack album,\u0026nbsp;recently featured in this ad \u003Ca href=\"https://www.dswshoes.com/tv_commercial.jsp?m=october2007\"\u003Ehttps://www.dswshoes.com/tv_commercial.jsp?m=october2007\u003C/a\u003E ","thumbnail_url":"http://i1.sndcdn.com/artworks-000000001720-91c40a-t500x500.jpg?330b92d","html":"\u003Ciframe width=\"100\" height=\"100\" scrolling=\"no\" frameborder=\"no\" src=\"http://w.soundcloud.com/player/?url=http%3A%2F%2Fapi.soundcloud.com%2Ftracks%2F293\u0026show_artwork=true\u0026show_comments=false\u0026maxwidth=100\u0026maxheight=100\u0026auto_play=false\"\u003E\u003C/iframe\u003E","author_name":"Forss","author_url":"http://soundcloud.com/forss"}'
-    FakeWeb.register_uri(:get, %r|http://soundcloud\.com/oembed|, :body => response)
-
-    result = auto_html('http://www.soundcloud.com/forss/flickermood') { soundcloud(:maxwidth => '100', :maxheight => '100', :auto_play => false, :show_comments => false) }
-    assert_equal '<iframe width="100" height="100" scrolling="no" frameborder="no" src="http://w.soundcloud.com/player/?url=http%3A%2F%2Fapi.soundcloud.com%2Ftracks%2F293&show_artwork=true&show_comments=false&maxwidth=100&maxheight=100&auto_play=false"></iframe>', result
+    result = auto_html('http://www.soundcloud.com/forss/flickermood') { soundcloud(:width => '50%', :height => '100', :auto_play => true, :show_comments => true) }    
+    assert_equal '<iframe width="50%" height="100" scrolling="no" frameborder="no" src="http://w.soundcloud.com/player/?url=http://www.soundcloud.com/forss/flickermood&show_artwork=false&show_comments=true&auto_play=true&color=915f33&theme_color=00FF00"></iframe>', result
   end
 end

data/test/unit/filters/twitter_test.rb

@@ -0,0 +1,40 @@
+require File.expand_path('../../unit_test_helper', __FILE__)
+require 'fakeweb'
+
+class TwitterTest < Test::Unit::TestCase
+
+  def setup
+    response = %Q(
+      {
+        "type": "rich",
+        "url": "http://twitter.com/danmartell/status/279651488517738496",
+        "cache_age": "31536000000",
+        "height": null,
+        "html": "things",
+        "version": "1.0",
+        "provider_name": "Twitter",
+        "width": 550,
+        "provider_url": "http://twitter.com",
+        "author_name": "Dan Martell",
+        "author_url": "http://twitter.com/danmartell"
+    })
+    
+    FakeWeb.register_uri(:get, %r|http://api\.twitter\.com/1/statuses/oembed\.json|, :body => response)
+  end
+
+  def test_transform
+    transormed_html = "things"
+    result = auto_html('https://twitter.com/danmartell/statuses/279651488517738496') { twitter }
+    assert_equal transormed_html, result
+  end
+
+  def test_dont_transform_a_regular_link_to_twitter
+    transormed_html = %Q(<blockquote class="twitter-tweet"><p>Stop saying you can't! Start asking "What would need to be true for me to accomplish this" - it'll change your life. <a href="https://twitter.com/search/%23focus">#focus</a> <a href="https://twitter.com/search/%23solutions">#solutions</a></p>&mdash; Dan Martell (@danmartell) <a href="https://twitter.com/danmartell/status/279651488517738496" data-datetime="2012-12-14T18:18:05+00:00">December 14, 2012</a></blockquote>
+<script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>)
+
+    result = auto_html(transormed_html) { twitter }
+
+    assert_equal transormed_html, result
+  end
+
+end

data/test/unit/filters/worldstar_test.rb

@@ -0,0 +1,14 @@
+require File.expand_path('../../unit_test_helper', __FILE__)
+
+class WorldstarTest < Test::Unit::TestCase 
+
+	def test_transform
+		result = auto_html('http://www.worldstarhiphop.com/videos/video.php?v=wshhc29WLkx550Hv9o31') { worldstar }
+		assert_equal '<object width="448" height="374"><param name="movie" value="http://www.worldstarhiphop.com/videos/e/16711680/wshhc29WLkx550Hv9o31"><param name="allowFullScreen" value="true"></param><embed src="http://www.worldstarhiphop.com/videos/e/16711680/wshhc29WLkx550Hv9o31" type="application/x-shockwave-flash" allowFullscreen="true" width="448" height="374"></embed></object>', result
+	end
+
+	def test_transform_with_options
+		result = auto_html('http://www.worldstarhiphop.com/videos/video.php?v=wshhc29WLkx550Hv9o31') { worldstar(:width => 400, :height => 250)}
+		assert_equal '<object width="400" height="250"><param name="movie" value="http://www.worldstarhiphop.com/videos/e/16711680/wshhc29WLkx550Hv9o31"><param name="allowFullScreen" value="true"></param><embed src="http://www.worldstarhiphop.com/videos/e/16711680/wshhc29WLkx550Hv9o31" type="application/x-shockwave-flash" allowFullscreen="true" width="400" height="250"></embed></object>', result
+	end
+end

data/test/unit/filters/youtube_test.rb

@@ -16,12 +16,17 @@ class YouTubeTest < Test::Unit::TestCase
     result = auto_html('http://www.youtube.com/watch?v=BwNrmYRiX_o&feature=related') { youtube }
     assert_equal '<iframe width="420" height="315" src="//www.youtube.com/embed/BwNrmYRiX_o" frameborder="0" allowfullscreen></iframe>', result
   end
-  
+
   def test_transform3
     result = auto_html('foo http://www.youtube.com/watch?v=fT1ahr81HLw bar') { youtube }
     assert_equal 'foo <iframe width="420" height="315" src="//www.youtube.com/embed/fT1ahr81HLw" frameborder="0" allowfullscreen></iframe> bar', result
   end
 
+  def test_transform4
+    result = auto_html('foo http://www.youtube.com/watch?v=fT1ahr81HLw<br>bar') { youtube }
+    assert_equal 'foo <iframe width="420" height="315" src="//www.youtube.com/embed/fT1ahr81HLw" frameborder="0" allowfullscreen></iframe><br>bar', result
+  end
+
   def test_transform_url_without_www
     result = auto_html('http://youtube.com/watch?v=BwNrmYRiX_o') { youtube }
     assert_equal '<iframe width="420" height="315" src="//www.youtube.com/embed/BwNrmYRiX_o" frameborder="0" allowfullscreen></iframe>', result
@@ -36,12 +41,12 @@ class YouTubeTest < Test::Unit::TestCase
     result = auto_html('http://www.youtu.be/BwNrmYRiX_o') { youtube }
     assert_equal '<iframe width="420" height="315" src="//www.youtube.com/embed/BwNrmYRiX_o" frameborder="0" allowfullscreen></iframe>', result
   end
-  
+
   def test_transform_https
     result = auto_html("https://www.youtube.com/watch?v=t7NdBIA4zJg") { youtube }
     assert_equal '<iframe width="420" height="315" src="//www.youtube.com/embed/t7NdBIA4zJg" frameborder="0" allowfullscreen></iframe>', result
   end
-  
+
   def test_short_with_params
     result = auto_html("http://youtu.be/t7NdBIA4zJg?t=1s&hd=1") { youtube }
     assert_equal '<iframe width="420" height="315" src="//www.youtube.com/embed/t7NdBIA4zJg" frameborder="0" allowfullscreen></iframe>', result

metadata

@@ -1,62 +1,55 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: auto_html
-version: !ruby/object:Gem::Version 
-  hash: 15
+version: !ruby/object:Gem::Version
+  version: 1.6.1
   prerelease: 
-  segments: 
-  - 1
-  - 6
-  - 0
-  version: 1.6.0
 platform: ruby
-authors: 
+authors:
 - Dejan Simic
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-07-29 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-01-05 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rinku
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 5
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.5.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: redcarpet
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 0
-        version: "2.0"
+      - !ruby/object:Gem::Version
+        version: 1.5.0
+- !ruby/object:Gem::Dependency
+  name: redcarpet
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
-  version_requirements: *id002
-description: Automatically transforms URIs (via domain) and includes the destination resource (Vimeo, YouTube movie, image, ...) in your document
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
+description: Automatically transforms URIs (via domain) and includes the destination
+  resource (Vimeo, YouTube movie, image, ...) in your document
 email: desimic@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - Rakefile
 - lib/auto_html/auto_html_for.rb
 - lib/auto_html/base.rb
@@ -68,6 +61,7 @@ files:
 - lib/auto_html/filters/gist.rb
 - lib/auto_html/filters/google_map.rb
 - lib/auto_html/filters/google_video.rb
+- lib/auto_html/filters/hashtag.rb
 - lib/auto_html/filters/html_escape.rb
 - lib/auto_html/filters/image.rb
 - lib/auto_html/filters/link.rb
@@ -78,6 +72,7 @@ files:
 - lib/auto_html/filters/soundcloud.rb
 - lib/auto_html/filters/twitter.rb
 - lib/auto_html/filters/vimeo.rb
+- lib/auto_html/filters/worldstar.rb
 - lib/auto_html/filters/youtube.rb
 - lib/auto_html/filters/youtube_js_api.rb
 - lib/auto_html/railtie.rb
@@ -95,7 +90,7 @@ files:
 - test/unit/filters/dailymotion_test.rb
 - test/unit/filters/gist_test.rb
 - test/unit/filters/google_map_test.rb
-- test/unit/filters/google_video_test.rb
+- test/unit/filters/hashtag_test.rb
 - test/unit/filters/html_escape_test.rb
 - test/unit/filters/image_test.rb
 - test/unit/filters/link_test.rb
@@ -104,43 +99,35 @@ files:
 - test/unit/filters/sanitize_test.rb
 - test/unit/filters/simple_format_test.rb
 - test/unit/filters/soundcloud_test.rb
+- test/unit/filters/twitter_test.rb
 - test/unit/filters/vimeo_test.rb
+- test/unit/filters/worldstar_test.rb
 - test/unit/filters/youtube_js_api_test.rb
 - test/unit/filters/youtube_test.rb
 - test/unit/unit_test_helper.rb
 - README.md
 homepage: http://github.com/dejan/auto_html
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Transform URIs to appropriate markup
 test_files: []
-

data/test/unit/filters/google_video_test.rb

@@ -1,15 +0,0 @@
-require File.expand_path('../../unit_test_helper', __FILE__)
-
-class GoogleVideoTest < Test::Unit::TestCase
-
-  def test_transform
-    result = auto_html("http://video.google.com/videoplay?docid=-7533500868750350977&ei=Xin8Sc-KBYeg2ALXkKymAQ&q=office+space&emb=1") { google_video }
-    assert_equal '<object width="650" height="391"><param name="movie" value="http://video.google.com/googleplayer.swf?docid=-7533500868750350977&hl=en&fs=true"></param><param name="wmode" value="transparent"></param><embed src="http://video.google.com/googleplayer.swf?docid=-7533500868750350977" type="application/x-shockwave-flash" wmode="transparent" width="650" height="391"></embed></object>', result
-  end
-
-  def test_transform_with_options
-    result = auto_html("http://video.google.com/videoplay?docid=7442132741322615356") { google_video(:width => 500, :height => 300) }
-    assert_equal '<object width="500" height="300"><param name="movie" value="http://video.google.com/googleplayer.swf?docid=7442132741322615356&hl=en&fs=true"></param><param name="wmode" value="transparent"></param><embed src="http://video.google.com/googleplayer.swf?docid=7442132741322615356" type="application/x-shockwave-flash" wmode="transparent" width="500" height="300"></embed></object>', result
-  end
-
-end