auto_html 1.6.2 → 1.6.3

data/lib/auto_html/filters/liveleak.rb

@@ -0,0 +1,19 @@
+AutoHtml.add_filter(:liveleak).with(:width => 420, :height => 315, :frameborder => 0, :wmode => nil, :autoplay => false, :hide_related => false) do |text, options|
+  regex = %r{http://www\.liveleak\.com/(?:ll_embed|view)\?.=(\w+)}
+  text.gsub(regex) do
+    liveleak_id = $1
+    width = options[:width]
+    height = options[:height]
+    frameborder = options[:frameborder]
+    wmode = options[:wmode]
+    autoplay = options[:autoplay]
+    hide_related = options[:hide_related]
+    src = "http://www.liveleak.com/ll_embed?f=#{liveleak_id}"
+    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/lib/auto_html/filters/twitter.rb

@@ -2,15 +2,18 @@ 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+}
+  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)
 
-    uri = URI("http://api.twitter.com/1/statuses/oembed.json")
+    uri = URI("https://api.twitter.com/1/statuses/oembed.json")
     uri.query = URI.encode_www_form(params)
 
-    response = JSON.parse(Net::HTTP.get(uri))
+    http = Net::HTTP.new(uri.host, uri.port)
+    http.use_ssl = true
+
+    response = JSON.parse(http.get(uri.request_uri).body)
     response["html"]
   end
 end

data/test/unit/filters/liveleak_test.rb

@@ -0,0 +1,15 @@
+require File.expand_path('../../unit_test_helper', __FILE__)
+
+class LiveLeakTest < Test::Unit::TestCase
+
+  def test_transform
+    result = auto_html('http://www.liveleak.com/view?i=BwNrmYRiX_o') { liveleak }
+    assert_equal '<iframe width="420" height="315" src="http://www.liveleak.com/ll_embed?f=BwNrmYRiX_o" frameborder="0" allowfullscreen></iframe>', result
+  end
+
+  def test_transform2
+    result = auto_html('http://www.liveleak.com/ll_embed?f=ef8304ab85e5') { liveleak }
+    assert_equal '<iframe width="420" height="315" src="http://www.liveleak.com/ll_embed?f=ef8304ab85e5" frameborder="0" allowfullscreen></iframe>', result
+  end
+
+end

data/test/unit/filters/twitter_test.rb

@@ -6,35 +6,40 @@ class TwitterTest < Test::Unit::TestCase
   def setup
     response = %Q(
       {
-        "type": "rich",
-        "url": "http://twitter.com/danmartell/status/279651488517738496",
-        "cache_age": "31536000000",
+        "author_name": "Dan Martell",
+        "author_url": "https://twitter.com/danmartell",
+        "cache_age": "3153600000",
         "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"
+        "provider_url": "https://twitter.com",
+        "type": "rich",
+        "url": "https://twitter.com/danmartell/statuses/279651488517738496",
+        "version": "1.0",
+        "width": 550
     })
-    
-    FakeWeb.register_uri(:get, %r|http://api\.twitter\.com/1/statuses/oembed\.json|, :body => response)
+
+    FakeWeb.register_uri(:get, %r|https://api\.twitter\.com/1/statuses/oembed\.json|, :body => response)
   end
 
   def test_transform
-    transormed_html = "things"
+    transformed_html = "things"
     result = auto_html('https://twitter.com/danmartell/statuses/279651488517738496') { twitter }
-    assert_equal transormed_html, result
+    assert_equal transformed_html, result
+  end
+
+  def test_transform_with_dangling_slash
+    transformed_html = "things"
+    result = auto_html('https://twitter.com/danmartell/statuses/279651488517738496/') { twitter }
+    assert_equal transformed_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>
+    transformed_html = %Q(<blockquote class="twitter-tweet"><p>Stop saying you can&#39;t! Start asking &quot;What would need to be true for me to accomplish this&quot; - it&#39;ll change your life. <a href="https://twitter.com/search?q=%23focus&amp;src=hash">#focus</a> <a href="https://twitter.com/search?q=%23solutions&amp;src=hash">#solutions</a></p>&mdash; Dan Martell (@danmartell) <a href="https://twitter.com/danmartell/statuses/279651488517738496">December 14, 2012</a></blockquote>
 <script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>)
+    result = auto_html(transformed_html) { twitter }
 
-    result = auto_html(transormed_html) { twitter }
-
-    assert_equal transormed_html, result
+    assert_equal transformed_html, result
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: auto_html
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.6.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-15 00:00:00.000000000 Z
+date: 2014-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rinku
@@ -66,6 +66,7 @@ files:
 - lib/auto_html/filters/image.rb
 - lib/auto_html/filters/instagram.rb
 - lib/auto_html/filters/link.rb
+- lib/auto_html/filters/liveleak.rb
 - lib/auto_html/filters/metacafe.rb
 - lib/auto_html/filters/redcarpet.rb
 - lib/auto_html/filters/sanitize.rb
@@ -97,6 +98,7 @@ files:
 - test/unit/filters/image_test.rb
 - test/unit/filters/instagram_test.rb
 - test/unit/filters/link_test.rb
+- test/unit/filters/liveleak_test.rb
 - test/unit/filters/metacafe_test.rb
 - test/unit/filters/redcarpet_test.rb
 - test/unit/filters/sanitize_test.rb