onebox 1.5.43 → 1.5.44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0224a34962160e320d20498abd797e7f2bab310f
-  data.tar.gz: 94e3f2307ca70f15135ca6af8ecb04dc4432eeca
+  metadata.gz: 582db3162e74f04ce27959dbef0e385e27621406
+  data.tar.gz: 026c67c405e0e80fb0ceb1c7553eed6c724eb170
 SHA512:
-  metadata.gz: d25694266cb34abf1b404b49b09e408631b806f69d7f7e42ea7317e6f8a7fe38278e08333e7a34b5e1982f2ba45b460eebe5d97b0da41dbc557382884d023ba4
-  data.tar.gz: 5cfdf2fb1968f48ad9158ca1d6b26949671e7b2c7d7134bce88993e44df060fca4a668c208417e8e484f23ae395e1777e20572e70215c5a78df2a6a99ef49e5c
+  metadata.gz: 1bce5e96adfaecb9ffd25c014f0e96b501e32738965b12a3fd3458b3a619dc5fe82718bfc7e6c6d4fd3de0745d97db5eda460c6e99dd50e4ec7d70b643e04e33
+  data.tar.gz: 37eaee6c5aab1784e5af0d6ca086de9eb9aa8c18de8bf46e59f36ec845895e406db5c3e12b334c9f5d9a57eb382e1cd21f328533938679ec10e5700fab67a228

data/.rubocop.yml

@@ -9,7 +9,6 @@ AllCops:
 StringLiterals:
   Enabled: false
 
-# Limit lines to 79 characters.
 LineLength:
   Enabled: true
   Max: 180
@@ -28,4 +27,4 @@ CaseEquality:
   Enabled: false
 
 ClassVars:
-  Enabled: false
+  Enabled: false

data/lib/onebox/engine/amazon_onebox.rb

@@ -7,15 +7,14 @@ module Onebox
       include LayoutSupport
       include HTML
 
-
+      always_https
       matches_regexp(/^https?:\/\/(?:www)\.amazon\.(?<tld>com|ca|de|it|es|fr|co\.jp|co\.uk|cn|in|com\.br)\//)
 
       def url
         if match && match[:id]
-          _url = URI("http://www.amazon.#{tld}/gp/aw/d/" + URI::encode(match[:id]))
-          _url.scheme = URI(@url).scheme
-          return _url.to_s
+          return "https://www.amazon.#{tld}/gp/aw/d/#{URI::encode(match[:id])}"
         end
+
         @url
       end
 

data/lib/onebox/engine/stack_exchange_onebox.rb

@@ -6,10 +6,11 @@ module Onebox
       include JSON
 
       def self.domains
-        %w(stackexchange stackoverflow superuser serverfault askubuntu)
+        %w(stackexchange.com stackoverflow.com superuser.com serverfault.com askubuntu.com stackapps.com mathoverflow.net)
+            .map { |domain| Regexp.escape(domain) }
       end
 
-      matches_regexp /^https?:\/\/(?:(?:(?<subsubdomain>\w*)\.)?(?<subdomain>\w*)\.)?(?<domain>#{domains.join('|')})\.com\/(?:questions|q)\/(?<question>\d*)/
+      matches_regexp /^https?:\/\/(?:(?:(?<subsubdomain>\w*)\.)?(?<subdomain>\w*)\.)?(?<domain>#{domains.join('|')})\/((?:questions|q)\/(?<question_id>\d*)(\/.*\/(?<answer_id1>\d*))?|(a\/(?<answer_id2>\d*)))/
 
       def always_https?
         uri.host.split('.').length <= 3
@@ -23,7 +24,14 @@ module Onebox
 
       def url
         domain = URI(@url).host
-        "https://api.stackexchange.com/2.1/questions/#{match[:question]}?site=#{domain}"
+        question_id = match[:question_id]
+        answer_id = match[:answer_id2] || match[:answer_id1]
+
+        if answer_id
+          "https://api.stackexchange.com/2.2/answers/#{answer_id}?site=#{domain}&filter=!.FjueITQdx6-Rq3Ue9PWG.QZ2WNdW"
+        else
+          "https://api.stackexchange.com/2.2/questions/#{question_id}?site=#{domain}&filter=!5-duuxrJa-iw9oVvOA(JNimB5VIisYwZgwcfNI"
+        end
       end
 
       def data
@@ -32,9 +40,11 @@ module Onebox
         result = raw['items'][0]
         if result
           result['creation_date'] =
-            Time.at(result['creation_date'].to_i).strftime("%I:%M%p - %d %b %y")
+              Time.at(result['creation_date'].to_i).strftime("%I:%M%p - %d %b %y")
 
           result['tags'] = result['tags'].take(4).join(', ')
+          result['is_answer'] = result.key?('answer_id')
+          result['is_question'] = result.key?('question_id')
         end
         @data = result
       end

data/lib/onebox/engine/whitelisted_generic_onebox.rb

@@ -130,7 +130,8 @@ module Onebox
           wonderhowto.com
           wsj.com
           zappos.com
-          zillow.com)
+          zillow.com
+          change.org)
       end
 
       # Often using the `html` attribute is not what we want, like for some blogs that

data/lib/onebox/version.rb

@@ -1,3 +1,3 @@
 module Onebox
-  VERSION = "1.5.43"
+  VERSION = "1.5.44"
 end

data/spec/fixtures/stackexchange-answer.response

@@ -0,0 +1 @@
+{"items":[{"tags":["c","deobfuscation"],"owner":{"profile_image":"https://www.gravatar.com/avatar/4af3541c00d591e9a518b9c0b3b1190a?s=128&d=identicon&r=PG","display_name":"dasblinkenlight","link":"http://stackoverflow.com/users/335858/dasblinkenlight"},"last_activity_date":1461433376,"creation_date":1375356813,"answer_id":17992906,"link":"http://stackoverflow.com/questions/17992553/concept-behind-these-four-lines-of-tricky-c-code/17992906#17992906","title":"Concept behind these four lines of tricky C code"}],"has_more":false,"quota_max":300,"quota_remaining":291}

data/spec/fixtures/stackexchange-question.response

@@ -0,0 +1 @@
+{"items":[{"tags":["c","deobfuscation"],"owner":{"profile_image":"https://www.gravatar.com/avatar/a19d396231d67d604c92866b90fe723d?s=128&d=identicon&r=PG","display_name":"codeslayer1","link":"http://stackoverflow.com/users/2547190/codeslayer1"},"last_activity_date":1461433376,"creation_date":1375355768,"question_id":17992553,"link":"http://stackoverflow.com/questions/17992553/concept-behind-these-four-lines-of-tricky-c-code","title":"Concept behind these four lines of tricky C code"}],"has_more":false,"quota_max":300,"quota_remaining":292}

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

@@ -2,8 +2,8 @@ require "spec_helper"
 
 describe Onebox::Engine::AmazonOnebox do
   before(:all) do
-    @link = "http://www.amazon.com/Knit-Noro-Accessories-Colorful-Little/dp/193609620X"
-    @uri = "http://www.amazon.com/gp/aw/d/193609620X"
+    @link = "https://www.amazon.com/Knit-Noro-Accessories-Colorful-Little/dp/193609620X"
+    @uri = "https://www.amazon.com/gp/aw/d/193609620X"
   end
 
   include_context "engines"
@@ -14,47 +14,47 @@ describe Onebox::Engine::AmazonOnebox do
     def check_link(tdl, link)
       onebox_cls = Onebox::Matcher.new(link).oneboxed
       expect(onebox_cls).to_not be(nil)
-      expect(onebox_cls.new(link).url).to include("http://www.amazon.#{tdl}")
+      expect(onebox_cls.new(link).url).to include("https://www.amazon.#{tdl}")
     end
 
     it "matches canadian domains" do
-      check_link("ca", "http://www.amazon.ca/Too-Much-Happiness-Alice-Munro-ebook/dp/B0031TZ98K/")
+      check_link("ca", "https://www.amazon.ca/Too-Much-Happiness-Alice-Munro-ebook/dp/B0031TZ98K/")
     end
 
     it "matches german domains" do
-      check_link("de", "http://www.amazon.de/Buddenbrooks-Verfall-einer-Familie-Roman/dp/3596294312/")
+      check_link("de", "https://www.amazon.de/Buddenbrooks-Verfall-einer-Familie-Roman/dp/3596294312/")
     end
 
     it "matches uk domains" do
-      check_link("co.uk", "http://www.amazon.co.uk/Pygmalion-George-Bernard-Shaw/dp/1420925237/")
+      check_link("co.uk", "https://www.amazon.co.uk/Pygmalion-George-Bernard-Shaw/dp/1420925237/")
     end
 
     it "matches japanese domains" do
-      check_link("co.jp", "http://www.amazon.co.jp/%E9%9B%AA%E5%9B%BD-%E6%96%B0%E6%BD%AE%E6%96%87%E5%BA%AB-%E3%81%8B-1-1-%E5%B7%9D%E7%AB%AF-%E5%BA%B7%E6%88%90/dp/4101001014/")
+      check_link("co.jp", "https://www.amazon.co.jp/%E9%9B%AA%E5%9B%BD-%E6%96%B0%E6%BD%AE%E6%96%87%E5%BA%AB-%E3%81%8B-1-1-%E5%B7%9D%E7%AB%AF-%E5%BA%B7%E6%88%90/dp/4101001014/")
     end
 
     it "matches chinese domains" do
-      check_link("cn", "http://www.amazon.cn/%E5%AD%99%E5%AD%90%E5%85%B5%E6%B3%95-%E5%AD%99%E8%86%91%E5%85%B5%E6%B3%95-%E5%AD%99%E6%AD%A6/dp/B0011C40FC/")
+      check_link("cn", "https://www.amazon.cn/%E5%AD%99%E5%AD%90%E5%85%B5%E6%B3%95-%E5%AD%99%E8%86%91%E5%85%B5%E6%B3%95-%E5%AD%99%E6%AD%A6/dp/B0011C40FC/")
     end
 
     it "matches french domains" do
-      check_link("fr", "http://www.amazon.fr/Les-Mots-autres-%C3%A9crits-autobiographiques/dp/2070114147/")
+      check_link("fr", "https://www.amazon.fr/Les-Mots-autres-%C3%A9crits-autobiographiques/dp/2070114147/")
     end
 
     it "matches italian domains" do
-      check_link("it", "http://www.amazon.it/Tutte-poesie-Salvatore-Quasimodo/dp/8804520477/")
+      check_link("it", "https://www.amazon.it/Tutte-poesie-Salvatore-Quasimodo/dp/8804520477/")
     end
 
     it "matches spanish domains" do
-      check_link("es", "http://www.amazon.es/familia-Pascual-Duarte-Camilo-Jos%C3%A9-ebook/dp/B00EJRTKTW/")
+      check_link("es", "https://www.amazon.es/familia-Pascual-Duarte-Camilo-Jos%C3%A9-ebook/dp/B00EJRTKTW/")
     end
 
     it "matches brasilian domains" do
-      check_link("com.br", "http://www.amazon.com.br/A-p%C3%A1tria-chuteiras-Nelson-Rodrigues-ebook/dp/B00J2B414Y/")
+      check_link("com.br", "https://www.amazon.com.br/A-p%C3%A1tria-chuteiras-Nelson-Rodrigues-ebook/dp/B00J2B414Y/")
     end
 
     it "matches indian domains" do
-      check_link("in", "http://www.amazon.in/Fireflies-Rabindranath-Tagore/dp/9381523169/")
+      check_link("in", "https://www.amazon.in/Fireflies-Rabindranath-Tagore/dp/9381523169/")
     end
 
   end
@@ -65,7 +65,7 @@ describe Onebox::Engine::AmazonOnebox do
         .to eq("https://www.amazon.fr/gp/aw/d/B01BYD0TZM")
 
       expect(described_class.new("http://www.amazon.fr/gp/product/B01BYD0TZM").url)
-        .to eq("http://www.amazon.fr/gp/aw/d/B01BYD0TZM")
+        .to eq("https://www.amazon.fr/gp/aw/d/B01BYD0TZM")
     end
   end
 

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

@@ -3,7 +3,7 @@ require "spec_helper"
 describe Onebox::Engine::JSON do
   before(:all) do
     @link = "http://stackoverflow.com"
-    fake(@link, response("stackexchange"))
+    fake(@link, response("stackexchange-question"))
   end
   before(:each) { Onebox.options.cache.clear }
 

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

@@ -1,17 +1,97 @@
-require "spec_helper"
+require 'spec_helper'
 
 describe Onebox::Engine::StackExchangeOnebox do
-  before(:all) do
-    @link = "http://stackoverflow.com/questions/17992553/concept-behind-these-four-lines-of-tricky-c-code"
-    fake("https://api.stackexchange.com/2.1/questions/17992553?site=stackoverflow.com", response(described_class.onebox_name))
+  describe 'domains' do
+    [
+        'stackoverflow.com', 'meta.stackoverflow.com',
+        'superuser.com', 'meta.superuser.com',
+        'serverfault.com', 'meta.serverfault.com',
+        'askubuntu.com', 'meta.askubuntu.com',
+        'mathoverflow.net', 'meta.mathoverflow.net',
+        'money.stackexchange.com', 'meta.money.stackexchange.com',
+        'stackapps.com'
+    ].each do |domain|
+      it "matches question with short URL on #{domain}" do
+        expect(described_class === URI("http://#{domain}/q/55495")).to eq(true)
+      end
+
+      it "matches question with long URL on #{domain}" do
+        expect(described_class === URI("http://#{domain}/questions/55495/title-of-question")).to eq(true)
+      end
+
+      it "matches answer with short URL on #{domain}" do
+        expect(described_class === URI("http://#{domain}/a/55503")).to eq(true)
+      end
+
+      it "matches question with long URL on #{domain}" do
+        expect(described_class === URI("http://#{domain}/questions/55495/title-of-question/55503#55503")).to eq(true)
+      end
+    end
+
+    it "doesn't match question on example.com" do
+      expect(described_class === URI('http://example.com/q/4711')).to eq(false)
+    end
+
+    it "doesn't match answer on example.com" do
+      expect(described_class === URI('http://example.com/a/4711')).to eq(false)
+    end
+  end
+
+  {
+      'long URL' => 'http://stackoverflow.com/questions/17992553/concept-behind-these-four-lines-of-tricky-c-code',
+      'short URL'=> 'http://stackoverflow.com/q/17992553'
+  }.each do |name, url|
+    describe "question with #{name}" do
+      before(:all) do
+        @link = url
+        fake('https://api.stackexchange.com/2.2/questions/17992553?site=stackoverflow.com&filter=!5-duuxrJa-iw9oVvOA(JNimB5VIisYwZgwcfNI', response('stackexchange-question'))
+      end
+
+      include_context 'engines'
+      it_behaves_like 'an engine'
+
+      describe '#to_html' do
+        it 'includes question title' do
+          expect(html).to include('Concept behind these four lines of tricky C code')
+        end
+
+        it "includes 'asked by'" do
+          expect(html).to include('asked by')
+        end
+
+        it "doesn't include 'answered by'" do
+          expect(html).not_to include('answered by')
+        end
+      end
+    end
   end
 
-  include_context "engines"
-  it_behaves_like "an engine"
+  {
+      'long URL' => 'http://stackoverflow.com/questions/17992553/concept-behind-these-four-lines-of-tricky-c-code/17992906#17992906',
+      'short URL'=> 'http://stackoverflow.com/a/17992906'
+  }.each do |name, url|
+    describe "answer with #{name}" do
+      before(:all) do
+        @link = url
+        fake('https://api.stackexchange.com/2.2/answers/17992906?site=stackoverflow.com&filter=!.FjueITQdx6-Rq3Ue9PWG.QZ2WNdW', response('stackexchange-answer'))
+      end
+
+      include_context 'engines'
+      it_behaves_like 'an engine'
+
+      describe '#to_html' do
+        it 'includes question title' do
+          expect(html).to include('Concept behind these four lines of tricky C code')
+        end
+
+        it "includes 'answered by'" do
+          expect(html).to include('answered by')
+        end
 
-  describe "#to_html" do
-    it "includes question" do
-      expect(html).to include("Concept behind these four lines of tricky C++ code")
+        it "doesn't include 'asked by'" do
+          expect(html).not_to include('asked by')
+        end
+      end
     end
   end
-end
+end

data/spec/lib/onebox/preview_spec.rb

@@ -3,13 +3,13 @@ require "spec_helper"
 describe Onebox::Preview do
 
   before do
-    fake("http://www.amazon.com/product", response("amazon"))
-    FakeWeb.register_uri(:get, "http://www.amazon.com/404-url", status: 404)
-    FakeWeb.register_uri(:get, "http://www.amazon.com/500-url", status: 500)
-    FakeWeb.register_uri(:get, "http://www.amazon.com/error-url", status: 500)
-    FakeWeb.register_uri(:get, "http://www.amazon.com/timeout-url", exception: Timeout::Error)
-    FakeWeb.register_uri(:get, "http://www.amazon.com/http-error", exception: Net::HTTPError)
-    FakeWeb.register_uri(:get, "http://www.amazon.com/error-connecting", exception: Errno::ECONNREFUSED)
+    fake("https://www.amazon.com/product", response("amazon"))
+    FakeWeb.register_uri(:get, "https://www.amazon.com/404-url", status: 404)
+    FakeWeb.register_uri(:get, "https://www.amazon.com/500-url", status: 500)
+    FakeWeb.register_uri(:get, "https://www.amazon.com/error-url", status: 500)
+    FakeWeb.register_uri(:get, "https://www.amazon.com/timeout-url", exception: Timeout::Error)
+    FakeWeb.register_uri(:get, "https://www.amazon.com/http-error", exception: Net::HTTPError)
+    FakeWeb.register_uri(:get, "https://www.amazon.com/error-connecting", exception: Errno::ECONNREFUSED)
   end
 
   let(:preview_url) { "http://www.amazon.com/product" }

data/spec/lib/onebox_spec.rb

@@ -3,11 +3,18 @@ require "spec_helper"
 describe Onebox do
 
   before do
-    fake("http://www.amazon.com", response("amazon"))
+    fake("https://www.amazon.com/product", response("amazon"))
   end
 
   describe ".preview" do
     let(:url) { "http://www.amazon.com/product" }
+
+    let(:https_url) do
+      uri = URI(url)
+      uri.scheme = 'https'
+      uri.to_s
+    end
+
     it "creates a cache that responds as expected" do
       preview = Onebox.preview(url)
       cache = preview.cache
@@ -18,13 +25,13 @@ describe Onebox do
       preview = Onebox.preview(url)
       preview.to_s
       cache = preview.cache
-      expect(cache.key?(url)).to eq(true)
+      expect(cache.key?(https_url)).to eq(true)
     end
 
     it "replaces the cache if the cache is expired" do
       preview = Onebox.preview(url, cache: Moneta.new(:Memory, expires: 100_000, serializer: :json))
       cache = preview.cache
-      expect(cache.fetch(url)).to be(nil)
+      expect(cache.fetch(https_url)).to be(nil)
     end
   end
 

data/templates/_layout.mustache

@@ -1,6 +1,6 @@
 <aside class="onebox {{subname}}">
   <header class="source">
-    <a href="{{{link}}}">
+    <a href="{{{link}}}" target='_blank' >
       {{#repository_path}}{{repository_path}}{{/repository_path}}
       {{^repository_path}}{{domain}}{{/repository_path}}
     </a>

data/templates/amazon.mustache

@@ -1,6 +1,6 @@
 <img src="{{image}}" class="thumbnail"/>
 
-<h3><a href='{{link}}'>{{title}}</a></h3>
+<h3><a href='{{link}}' target='_blank'>{{title}}</a></h3>
 {{#by_info}}<b>{{by_info}}</b>{{/by_info}}
 <p>{{description}}</p>
-<p><strong>{{price}}<strong></p>
+<p><strong>{{price}}</strong></p>

data/templates/douban.mustache

@@ -1,5 +1,5 @@
 <img src="{{image}}" class="thumbnail"/>
 
-<h3><a href='{{{link}}}'>{{title}}</a></h3>
+<h3><a href='{{{link}}}' target='_blank'>{{title}}</a></h3>
 
 <p>{{description}}</p>

data/templates/stackexchange.mustache

@@ -12,7 +12,9 @@
 </div>
 
 <div class="date">
-  asked by <a href="{{owner.link}}" target="_blank">
+  {{#is_question}}asked by{{/is_question}}
+  {{#is_answer}}answered by{{/is_answer}}
+  <a href="{{owner.link}}" target="_blank">
     {{owner.display_name}}
   </a>
   on <a href="{{link}}" target="_blank">{{creation_date}}</a>

data/templates/twitterstatus.mustache

@@ -1,6 +1,6 @@
 {{#avatar}}<img src="{{avatar}}" class="thumbnail">{{/avatar}}
 <h4>
-  <a href='{{link}}'>
+  <a href='{{link}}' target='_blank'>
     {{title}}
   </a>
 </h4>

data/templates/whitelistedgeneric.mustache

@@ -1,5 +1,5 @@
 {{#image}}<img src="{{image}}" class="thumbnail"/>{{/image}}
 
-<h3><a href='{{{link}}}'>{{title}}</a></h3>
+<h3><a href='{{{link}}}'  target="_blank">{{title}}</a></h3>
 
 <p>{{description}}</p>

data/templates/wikipedia.mustache

@@ -1,5 +1,5 @@
 {{#image}}<img src="{{image}}" class="thumbnail"/>{{/image}}
 
-<h3><a href='{{{link}}}'>{{title}}</a></h3>
+<h3><a href='{{{link}}}' target='_blank'>{{title}}</a></h3>
 
 <p>{{description}}</p>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onebox
 version: !ruby/object:Gem::Version
-  version: 1.5.43
+  version: 1.5.44
 platform: ruby
 authors:
 - Joanna Zeta
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-13 00:00:00.000000000 Z
+date: 2016-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -354,7 +354,8 @@ files:
 - spec/fixtures/pubmed-xml.response
 - spec/fixtures/pubmed.response
 - spec/fixtures/slides.response
-- spec/fixtures/stackexchange.response
+- spec/fixtures/stackexchange-answer.response
+- spec/fixtures/stackexchange-question.response
 - spec/fixtures/steamstorewidget.response
 - spec/fixtures/twitterstatus.response
 - spec/fixtures/video.response
@@ -454,7 +455,8 @@ test_files:
 - spec/fixtures/pubmed-xml.response
 - spec/fixtures/pubmed.response
 - spec/fixtures/slides.response
-- spec/fixtures/stackexchange.response
+- spec/fixtures/stackexchange-answer.response
+- spec/fixtures/stackexchange-question.response
 - spec/fixtures/steamstorewidget.response
 - spec/fixtures/twitterstatus.response
 - spec/fixtures/video.response
@@ -495,4 +497,3 @@ test_files:
 - spec/lib/onebox_spec.rb
 - spec/spec_helper.rb
 - spec/support/html_spec_helper.rb
-has_rdoc: 

data/spec/fixtures/stackexchange.response

@@ -1 +0,0 @@
-{"items":[{"tags":["c++","c","deobfuscation"],"owner":{"reputation":860,"user_id":2547190,"user_type":"registered","profile_image":"https://www.gravatar.com/avatar/a19d396231d67d604c92866b90fe723d?s=128&d=identicon&r=PG","display_name":"detonator123","link":"http://stackoverflow.com/users/2547190/detonator123"},"is_answered":true,"view_count":12676,"protected_date":1375930784,"accepted_answer_id":17992906,"answer_count":9,"score":244,"last_activity_date":1375930729,"creation_date":1375355768,"last_edit_date":1375645180,"question_id":17992553,"link":"http://stackoverflow.com/questions/17992553/concept-behind-these-four-lines-of-tricky-c-code","title":"Concept behind these four lines of tricky C++ code"}],"has_more":false,"quota_max":300,"quota_remaining":275}