auto_html 1.6.1 → 1.6.2

data/README.md

@@ -36,7 +36,7 @@ You'll probably have user input stored in model, so it's a good place to automat
 ... and you'll have this behavior: 
 
     Comment.create(:body => 'Hey check out this cool video: http://www.youtube.com/watch?v=WdsGihou8J4')  
-    => #<Comment id: 123, body: '<p>Hey check out this cool video: <iframe class="youtube-player" type="text/html" width="587" height="350" src="http://www.youtube.com/embed/WdsGihou8J4" frameborder="0"> <br /></iframe></p>'>
+    => #<Comment id: 123, body: '<p>Hey check out this cool video: <div class="video youtube"><iframe class="youtube-player" type="text/html" width="587" height="350" src="http://www.youtube.com/embed/WdsGihou8J4" frameborder="0"> <br /></iframe></div></p>'>
 
 Note that order of invoking filters is important, i.e. you want html_escape as first and link amongst last, so that it doesn't transform youtube URL to plain link.
 

data/lib/auto_html/filters/flickr.rb

@@ -1,8 +1,8 @@
-require 'uri'
-require 'net/http'
-require 'rexml/document'
-
 AutoHtml.add_filter(:flickr).with(:maxwidth => nil, :maxheight => nil, :link_options => {}) do |text, options|
+  require 'uri'
+  require 'net/http'
+  require 'rexml/document'
+
   regex = %r{http://(www\.)?flickr\.com/photos/[^\s<]*}
 
   text.gsub(regex) do |match|

data/lib/auto_html/filters/gist.rb

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

data/lib/auto_html/filters/hashtag.rb

@@ -1,7 +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>')
+    text.gsub(/#([^\s]+)/, '<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>')
+    text.gsub(/#([^\s]+)/, '<a href="https://www.facebook.com/hashtag/\1" class="hashtag" target="_blank">#\1</a>')
   end
 end

data/lib/auto_html/filters/instagram.rb

@@ -0,0 +1,10 @@
+require 'uri'
+require 'net/http'
+
+AutoHtml.add_filter(:instagram) do |text|
+  text << '/' unless text.end_with?('/')
+  regex = %r{https?:\/\/(www.)?instagr(am\.com|\.am)/p/.+}
+  text.gsub(regex) do
+    %{<iframe src="#{text}embed" height="714" width="616" frameborder="0" scrolling="no"></iframe>}
+  end
+end

data/lib/auto_html/filters/link.rb

@@ -1,8 +1,7 @@
-require 'uri'
-require 'rinku'
-require 'rexml/document'
-
 AutoHtml.add_filter(:link).with({}) do |text, options|
+  require 'uri'
+  require 'rinku'
+  require 'rexml/document'
   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) do |url|

data/lib/auto_html/filters/redcarpet.rb

@@ -1,5 +1,4 @@
 require 'redcarpet'
-
 AutoHtml.add_filter(:redcarpet).with(:renderer => Redcarpet::Render::HTML, :markdown_options => {}) do |text, options|
   Redcarpet::Markdown.new(options[:renderer], options[:markdown_options]).render(text)
-end
+end

data/lib/auto_html/filters/sanitize.rb

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

data/lib/auto_html/filters/simple_format.rb

@@ -1,6 +1,6 @@
-require 'action_view'
-
 AutoHtml.add_filter(:simple_format).with({}) do |text, html_options|
+  require 'action_view'
+
   args = [text, {}, {:sanitize => false}]
   begin
     ActionView::Base.new.simple_format(*args) 

data/lib/auto_html/filters/soundcloud.rb

@@ -1,9 +1,10 @@
 # encoding: UTF-8
-require 'uri'
 
 # 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|
+  require 'uri'
+  require 'net/http'
   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}")

data/lib/auto_html/filters/ted.rb

@@ -0,0 +1,13 @@
+# TED talks (http://www.ted.com)
+AutoHtml.add_filter(:ted).with(:width => 640, :height => 360, :scrolling => "no", :frameborder => 0, :allow_full_screen => false) do |text, options|
+  text.gsub(/https?:\/\/(www.|embed.)?ted\.com\/talks\/([A-Za-z0-9._%-]*)\.html((\?|#)\S+)?/) do
+    ted_page = $2
+    width = options[:width]
+    height = options[:height]
+    scrolling = options[:scrolling]
+    frameborder = options[:frameborder]
+    allow_full_screen = options[:allow_full_screen]
+
+    %{<iframe width="#{width}" height="#{height}" frameborder="#{frameborder}" scrolling="#{scrolling}" src="http://embed.ted.com/talks/#{ted_page}.html"#{allow_full_screen ? ' webkitAllowFullScreen mozallowfullscreen allowFullScreen' : ''}></iframe>}
+  end
+end

data/lib/auto_html/filters/twitter.rb

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

data/lib/auto_html/filters/youtube.rb

@@ -1,7 +1,7 @@
 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+)?/
+  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
+    youtube_id = $4
     width = options[:width]
     height = options[:height]
     frameborder = options[:frameborder]
@@ -14,6 +14,6 @@ AutoHtml.add_filter(:youtube).with(:width => 420, :height => 315, :frameborder =
     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>}
+    %{<div class="video youtube"><iframe width="#{width}" height="#{height}" src="#{src}" frameborder="#{frameborder}" allowfullscreen></iframe></div>}
   end
 end

data/test/test_helper.rb

@@ -2,6 +2,7 @@ require 'rubygems'
 
 require 'test/unit'
 require 'active_record'
+require 'action_view'
 require 'active_support/core_ext/class'
 
 require File.dirname(__FILE__) + '/../init'

data/test/unit/filters/gist_test.rb

@@ -4,12 +4,12 @@ class GistTest < Test::Unit::TestCase
 
   def test_transform
     result = auto_html('https://gist.github.com/1710276') { gist }
-    assert_equal '<script src="https://gist.github.com/1710276.js"></script>', result
+    assert_equal '<script type="text/javascript" src="https://gist.github.com/1710276.js"></script>', result
   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
+    assert_equal '<script type="text/javascript" src="https://gist.github.com/6547840.js"></script>', result
   end
 
 end

data/test/unit/filters/instagram_test.rb

@@ -0,0 +1,8 @@
+require File.expand_path('../../unit_test_helper', __FILE__)
+
+class InstagramTest < Test::Unit::TestCase
+  def test_instagram_embed
+    result = auto_html('http://instagram.com/p/WsQTLAGvx7/') { instagram }
+    assert_equal '<iframe src="http://instagram.com/p/WsQTLAGvx7/embed" height="714" width="616" frameborder="0" scrolling="no"></iframe>', result
+  end
+end

data/test/unit/filters/ted_test.rb

@@ -0,0 +1,18 @@
+require File.expand_path('../../unit_test_helper', __FILE__)
+
+class TedTest < Test::Unit::TestCase
+  def test_transform_url_with_www
+    output = auto_html('http://www.ted.com/talks/amy_cuddy_your_body_language_shapes_who_you_are.html') { ted }
+    assert_equal '<iframe width="640" height="360" frameborder="0" scrolling="no" src="http://embed.ted.com/talks/amy_cuddy_your_body_language_shapes_who_you_are.html"></iframe>', output
+  end
+
+  def test_transform_url_without_www
+    output = auto_html('http://ted.com/talks/amy_cuddy_your_body_language_shapes_who_you_are.html') { ted }
+    assert_equal '<iframe width="640" height="360" frameborder="0" scrolling="no" src="http://embed.ted.com/talks/amy_cuddy_your_body_language_shapes_who_you_are.html"></iframe>', output
+  end
+
+  def test_transform_url_with_options
+    result = auto_html('http://www.ted.com/talks/amy_cuddy_your_body_language_shapes_who_you_are.html') { ted(:width => '50%', :height => '100', :scrolling => 'yes', :frameborder => 1, :allow_full_screen => true) }
+    assert_equal '<iframe width="50%" height="100" frameborder="1" scrolling="yes" src="http://embed.ted.com/talks/amy_cuddy_your_body_language_shapes_who_you_are.html" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>', result
+  end
+end

data/test/unit/filters/youtube_test.rb

@@ -4,51 +4,56 @@ class YouTubeTest < Test::Unit::TestCase
 
   def test_transform
     result = auto_html('http://www.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
+    assert_equal '<div class="video youtube"><iframe width="420" height="315" src="//www.youtube.com/embed/BwNrmYRiX_o" frameborder="0" allowfullscreen></iframe></div>', result
   end
 
   def test_transform2
     result = auto_html('http://www.youtube.com/watch?v=BwNrmYRiX_o&eurl=http%3A%2F%2Fvukajlija.com%2Fvideo%2Fklipovi%3Fstrana%3D6&feature=player_embedded') { youtube }
-    assert_equal '<iframe width="420" height="315" src="//www.youtube.com/embed/BwNrmYRiX_o" frameborder="0" allowfullscreen></iframe>', result
+    assert_equal '<div class="video youtube"><iframe width="420" height="315" src="//www.youtube.com/embed/BwNrmYRiX_o" frameborder="0" allowfullscreen></iframe></div>', result
   end
 
   def test_transform3
     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
+    assert_equal '<div class="video youtube"><iframe width="420" height="315" src="//www.youtube.com/embed/BwNrmYRiX_o" frameborder="0" allowfullscreen></iframe></div>', 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
+    assert_equal 'foo <div class="video youtube"><iframe width="420" height="315" src="//www.youtube.com/embed/fT1ahr81HLw" frameborder="0" allowfullscreen></iframe></div> 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
+    assert_equal 'foo <div class="video youtube"><iframe width="420" height="315" src="//www.youtube.com/embed/fT1ahr81HLw" frameborder="0" allowfullscreen></iframe></div><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
+    assert_equal '<div class="video youtube"><iframe width="420" height="315" src="//www.youtube.com/embed/BwNrmYRiX_o" frameborder="0" allowfullscreen></iframe></div>', result
   end
 
   def test_transform_with_options
     result = auto_html('http://www.youtube.com/watch?v=BwNrmYRiX_o') { youtube(:width => 300, :height => 255, :frameborder => 1, :wmode => 'window') }
-    assert_equal '<iframe width="300" height="255" src="//www.youtube.com/embed/BwNrmYRiX_o?wmode=window" frameborder="1" allowfullscreen></iframe>', result
+    assert_equal '<div class="video youtube"><iframe width="300" height="255" src="//www.youtube.com/embed/BwNrmYRiX_o?wmode=window" frameborder="1" allowfullscreen></iframe></div>', result
   end
 
   def test_transform_with_short_url
     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
+    assert_equal '<div class="video youtube"><iframe width="420" height="315" src="//www.youtube.com/embed/BwNrmYRiX_o" frameborder="0" allowfullscreen></iframe></div>', 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
+    assert_equal '<div class="video youtube"><iframe width="420" height="315" src="//www.youtube.com/embed/t7NdBIA4zJg" frameborder="0" allowfullscreen></iframe></div>', 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
+    assert_equal '<div class="video youtube"><iframe width="420" height="315" src="//www.youtube.com/embed/t7NdBIA4zJg" frameborder="0" allowfullscreen></iframe></div>', result
+  end
+
+  def test_transform_without_protocol
+    result = auto_html("www.youtube.com/watch?v=t7NdBIA4zJg") { youtube }
+    assert_equal '<div class="video youtube"><iframe width="420" height="315" src="//www.youtube.com/embed/t7NdBIA4zJg" frameborder="0" allowfullscreen></iframe></div>', result
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: auto_html
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-05 00:00:00.000000000 Z
+date: 2014-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rinku
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.1'
 description: Automatically transforms URIs (via domain) and includes the destination
   resource (Vimeo, YouTube movie, image, ...) in your document
 email: desimic@gmail.com
@@ -64,12 +64,14 @@ files:
 - lib/auto_html/filters/hashtag.rb
 - lib/auto_html/filters/html_escape.rb
 - lib/auto_html/filters/image.rb
+- lib/auto_html/filters/instagram.rb
 - lib/auto_html/filters/link.rb
 - lib/auto_html/filters/metacafe.rb
 - lib/auto_html/filters/redcarpet.rb
 - lib/auto_html/filters/sanitize.rb
 - lib/auto_html/filters/simple_format.rb
 - lib/auto_html/filters/soundcloud.rb
+- lib/auto_html/filters/ted.rb
 - lib/auto_html/filters/twitter.rb
 - lib/auto_html/filters/vimeo.rb
 - lib/auto_html/filters/worldstar.rb
@@ -93,12 +95,14 @@ files:
 - test/unit/filters/hashtag_test.rb
 - test/unit/filters/html_escape_test.rb
 - test/unit/filters/image_test.rb
+- test/unit/filters/instagram_test.rb
 - test/unit/filters/link_test.rb
 - test/unit/filters/metacafe_test.rb
 - test/unit/filters/redcarpet_test.rb
 - test/unit/filters/sanitize_test.rb
 - test/unit/filters/simple_format_test.rb
 - test/unit/filters/soundcloud_test.rb
+- test/unit/filters/ted_test.rb
 - test/unit/filters/twitter_test.rb
 - test/unit/filters/vimeo_test.rb
 - test/unit/filters/worldstar_test.rb