onebox 1.8.6 → 1.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 389009d0633bfd3396fba23cb000eff26cb019d5
-  data.tar.gz: b2fac0d0854c26b0be21586636488f64936fb7c9
+  metadata.gz: ef00f44fb0438b70ec1b8cbe01573eb2ea5601b5
+  data.tar.gz: b6753a95e16de7f6d0a7b47c888d8e7683b48295
 SHA512:
-  metadata.gz: 494c648079d4ed949fad65c1a56f1b63d871fb5a49450c53ddc9242264c9038a9bc499d980d29636612f6089853e86cb7989da2ef7d039e45a3787e7a1d68ba4
-  data.tar.gz: 45b227ce833a00abd7783120aeb55df26cb98323d9be012c9f3d1eaf1453ec71c554e41156828ce28b322f130c5e43be1f376936fe0981a6870a27919b612eed
+  metadata.gz: b4f23e877c9f42bf9fa07d50b93f56fc8955aa22a6bd1a34d3a581c74bc796870024dcc8379689b8bcdccfb34b061d2ffa3f834b79d087f73ab1a75054da5478
+  data.tar.gz: d826e5abd61a33dbcab2cff3ac9af1a50b3a63d40b2151398617ea7b0b56c975509e0bf17f3adac05cc2a5e9bcb3bc4f7671a9a0e0e15366f665530013b7ac37

data/lib/onebox.rb

@@ -22,6 +22,7 @@ module Onebox
     allowed_ports: [80, 443],
     allowed_schemes: ["http", "https"],
     sanitize_config: Sanitize::Config::ONEBOX,
+    redirect_limit: 5
   }
 
   @@options = DEFAULTS

data/lib/onebox/helpers.rb

@@ -19,6 +19,9 @@ module Onebox
     end
 
     def self.fetch_response(location, limit=5, domain=nil, headers=nil)
+
+      limit = Onebox.options.redirect_limit if limit > Onebox.options.redirect_limit
+
       raise Net::HTTPError.new('HTTP redirect too deep', location) if limit == 0
 
       uri = URI(location)

data/lib/onebox/version.rb

@@ -1,3 +1,3 @@
 module Onebox
-  VERSION = "1.8.6"
+  VERSION = "1.8.7"
 end

data/spec/lib/onebox/engine/whitelisted_generic_onebox_spec.rb

@@ -84,10 +84,15 @@ describe Onebox::Engine::WhitelistedGenericOnebox do
   end
 
   describe 'to_html' do
+    after(:each) do
+      Onebox.options = Onebox::DEFAULTS
+    end
+
+    let(:original_link) { "http://www.dailymail.co.uk/pages/live/articles/news/news.html?in_article_id=479146&in_page_id=1770" }
+    let(:redirect_link) { 'http://www.dailymail.co.uk/news/article-479146/Brutality-justice-The-truth-tarred-feathered-drug-dealer.html' }
+
     before do
       described_class.whitelist = %w(dailymail.co.uk discourse.org)
-      original_link = "http://www.dailymail.co.uk/pages/live/articles/news/news.html?in_article_id=479146&in_page_id=1770"
-      redirect_link = 'http://www.dailymail.co.uk/news/article-479146/Brutality-justice-The-truth-tarred-feathered-drug-dealer.html'
       FakeWeb.register_uri(
         :get,
         original_link,
@@ -95,13 +100,18 @@ describe Onebox::Engine::WhitelistedGenericOnebox do
         location: redirect_link
       )
       fake(redirect_link, response('dailymail'))
-      onebox = described_class.new(original_link)
-      @html = onebox.to_html
     end
-    let(:html) { @html }
 
     it "follows redirects and includes the summary" do
-      expect(html).to include("It was the most chilling image of the week")
+      Onebox.options = { redirect_limit: 2 }
+      onebox = described_class.new(original_link)
+      expect(onebox.to_html).to include("It was the most chilling image of the week")
+    end
+
+    it "recives an error with too many redirects" do
+      Onebox.options = { redirect_limit: 1 }
+      onebox = described_class.new(original_link)
+      expect(onebox.to_html).to be_nil
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onebox
 version: !ruby/object:Gem::Version
-  version: 1.8.6
+  version: 1.8.7
 platform: ruby
 authors:
 - Joanna Zeta
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-17 00:00:00.000000000 Z
+date: 2017-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json