onebox 1.5.14 → 1.5.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66774548728354077668c4930c8c3ac05cb0706a
-  data.tar.gz: 4eb912093e93670dc737418582a1c2bf3d4ec41f
+  metadata.gz: 05960d76842fc3238a0f46a23628e0be16c1318a
+  data.tar.gz: 48c532235d45121bc4f3c781b52b6400db94debb
 SHA512:
-  metadata.gz: 8a70602d6840531198d155606f1a6bfb1b3bcf83f9d45d81917592136d6dfa3df8b6c55ab7a9a028f1feda98046ee460d576c1272214bd947109a26464e3a15a
-  data.tar.gz: 008d182e8c048a752ea581db973279a514e41a82b37f825652a2a617970141de570a30ff86ae61ecb10a16d62a43e37647087013a42cab5d9c67850f20bd46f3
+  metadata.gz: 6a7f575db20f96c4267882b4cb7c9ec2b2a2c2e7335897545342ad1074a7eeccdc2bf4edd087f714c759b7560571bbe9de0b8038cb9f7d34028f4f0708b29270
+  data.tar.gz: 0f5e9e0d2ea683fce332e4718ad4b810d5594159fedd2ccf9338c0d964fe90f9390f842c668d940570e7b7921697825486273c4b36bc4c02f1717309dcfec5aa

data/lib/onebox/engine.rb

@@ -142,3 +142,4 @@ require_relative "engine/douban_onebox"
 require_relative "engine/whitelisted_generic_onebox"
 require_relative "engine/pubmed_onebox"
 require_relative "engine/google_calendar_onebox"
+require_relative "engine/google_docs_onebox"

data/lib/onebox/engine/classic_google_maps_onebox.rb

@@ -2,46 +2,59 @@ module Onebox
   module Engine
     class ClassicGoogleMapsOnebox
       include Engine
-      include LayoutSupport
 
       matches_regexp /^(https?:)?\/\/((maps|www)\.google\.[\w.]{2,}|goo\.gl)\/maps?.+$/
 
-      def url
-        @url = get_long_url if @url.include?("//goo.gl/maps/")
-        @url = get_canonical_url if @url.include?("www.google")
-        @url
+      def initialize(link, cache = nil, timeout = nil)
+        super(link, cache, timeout)
+        resolve_url!
       end
 
       def to_html
-        "<iframe src='#{url}&output=embed' width='690px' height='400px' frameborder='0' style='border:0'></iframe>"
+        "<div style=\"background:transparent;position:relative;width:690px;height:400px;top:400px;margin-top:-400px;\" onClick=\"style.pointerEvents='none'\"></div> <iframe src=\"#{link}\" width=\"690px\" height=\"400px\" frameborder=\"0\" style=\"border:0\"></iframe>"
+      end
+
+      def placeholder_html
+        return to_html unless @placeholder
+        "<img src=\"http://maps.googleapis.com/maps/api/staticmap?maptype=roadmap&size=690x400&sensor=false&#{@placeholder}\" width=\"690\" height=\"400\"/>"
       end
 
       private
 
+      def resolve_url!
+        @url = follow_redirect(@url) if @url.include?("//goo.gl/maps")
+        if m = @url.match(/@([-.\d]+,[-.\d]+),(\d+)z/)
+          @placeholder = "center=#{m[1]}&zoom=#{m[2]}"
+        end
+
+        @url = follow_redirect(@url) if @url.include?("www.google")
+        query = Hash[*URI(@url).query.split("&").map{|a|a.split("=")}.flatten]
+        @url += "&ll=#{query["sll"]}" if !query["ll"]
+        @url += "&spn=#{query["sspn"]}" if !query["spn"]
+        if !@placeholder
+          angle = (query["spn"] || query["sspn"]).split(",").first.to_f
+          zoom = (Math.log(690.0 * 360.0 / angle / 256.0) / Math.log(2)).round
+          @placeholder = "center=#{query["ll"] || query["sll"]}&zoom=#{zoom}"
+        end
+
+        @url = (@url =~ /output=classic/) ?
+          @url.sub('output=classic', 'output=embed') :
+          @url + '&output=embed'
+      end
+
       def data
         {link: url, title: url}
       end
 
-      def get_canonical_url
-        uri = URI(@url)
+      def follow_redirect(link)
+        uri = URI(link)
         http = Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == 'https')
         http.open_timeout = timeout
         http.read_timeout = timeout
         response = http.head(uri.path)
-        response["Location"].sub(/&?output=classic/, '') if response.code == "302"
-      rescue
-        @url
-      end
-
-      def get_long_url
-        uri = URI(@url)
-        http = Net::HTTP.start(uri.host, uri.port)
-        http.open_timeout = timeout
-        http.read_timeout = timeout
-        response = http.head(uri.path)
-        response["Location"] if response.code == "301"
+        response["Location"] if %(301 302).include?(response.code)
       rescue
-        @url
+        link
       end
 
     end

data/lib/onebox/engine/github_blob_onebox.rb

@@ -199,7 +199,7 @@ module Onebox
                    #     as *side effects* of the `raw` method! They must all appear
                    #     AFTER the call to `raw`! Don't get bitten by this like I did!
                    content: raw,
-                   lang: @lang,
+                   lang: "lang-#{@lang}",
                    lines:  @selected_lines_array ,
                    has_lines: !@selected_lines_array.nil?,
                    selected_one_liner: @selected_one_liner,

data/lib/onebox/engine/google_docs_onebox.rb

@@ -0,0 +1,50 @@
+module Onebox
+  module Engine
+    class GoogleDocsOnebox
+      include Engine
+
+      def self.supported_endpoints
+        %w(spreadsheets document forms presentation)
+      end
+
+      matches_regexp /^(https?:)?\/\/(docs\.google\.com)\/(?<endpoint>(#{supported_endpoints.join('|')}))\/d\/((?<key>[\w-]*)).+$/
+
+      def to_html
+        if document?
+          "<iframe class='gdocs-onebox document-onebox' src='https://docs.google.com/document/d/#{key}/pub?embedded=true' style='border: 0' width='800' height='600' frameborder='0' scrolling='yes' ></iframe>"
+        elsif spreadsheet?
+          "<iframe class='gdocs-onebox spreadsheet-onebox' src='https://docs.google.com/spreadsheet/ccc?key=#{key}&usp=sharing&rm=minimal' style='border: 0' width='800' height='600' frameborder='0' scrolling='yes' ></iframe>"
+        elsif presentation?
+          "<iframe class='gdocs-onebox presentation-onebox' src='https://docs.google.com/presentation/d/#{key}/embed?start=false&loop=false&delayms=3000' frameborder='0' width='960' height='749' allowfullscreen='true' mozallowfullscreen='true' webkitallowfullscreen='true'></iframe>"
+        elsif forms?
+          "<iframe class='gdocs-onebox forms-onebox' src='https://docs.google.com/forms/d/#{key}/viewform?embedded=true' width='760' height='500' frameborder='0' marginheight='0' marginwidth='0' scrolling='yes'>Loading...</iframe>"
+        end
+      end
+
+      protected
+      def spreadsheet?
+        match[:endpoint] == 'spreadsheets'
+      end
+
+      def document?
+        match[:endpoint] == 'document'
+      end
+
+      def presentation?
+        match[:endpoint] == 'presentation'
+      end
+
+      def forms?
+        match[:endpoint] == 'forms'
+      end
+
+      def key
+        match[:key]
+      end
+
+      def match
+        @match ||= @url.match(@@matcher)
+      end
+    end
+  end
+end

data/lib/onebox/engine/standard_embed.rb

@@ -6,12 +6,25 @@ module Onebox
         @@oembed_providers ||= {}
       end
 
+      def self.opengraph_providers
+        @@opengraph_providers ||= Array.new
+      end
+
       def self.add_oembed_provider(regexp, endpoint)
         oembed_providers[regexp] = endpoint
       end
 
+      def self.add_opengraph_provider(regexp)
+        opengraph_providers.push(regexp)
+      end
+
       # Some oembed providers (like meetup.com) don't provide links to themselves
       add_oembed_provider /www\.meetup\.com\//, 'http://api.meetup.com/oembed'
+      add_oembed_provider /www\.kickstarter\.com\//, 'https://www.kickstarter.com/services/oembed'
+      add_oembed_provider /www\.ted\.com\//, 'http://www.ted.com/services/v1/oembed.json'
+
+      # Sites that work better with OpenGraph
+      add_opengraph_provider /gfycat\.com\//
 
       def raw
         return @raw if @raw
@@ -26,7 +39,14 @@ module Onebox
         response = Onebox::Helpers.fetch_response(url)
         html_doc = Nokogiri::HTML(response.body)
 
-        # Determine if we should use OEmbed or OpenGraph
+        StandardEmbed.opengraph_providers.each do |regexp|
+          if url =~ regexp
+            @raw = parse_open_graph(html_doc, url)
+            return @raw if @raw
+          end
+        end
+
+        # Determine if we should use oEmbed or OpenGraph (prefers oEmbed)
         oembed_alternate = html_doc.at("//link[@type='application/json+oembed']") || html_doc.at("//link[@type='text/json+oembed']")
         fetch_oembed_raw(oembed_alternate)
 

data/lib/onebox/engine/whitelisted_generic_onebox.rb

@@ -131,7 +131,7 @@ module Onebox
       # include the entire page HTML. However for some providers like Imgur it allows us
       # to return gifv and galleries.
       def self.default_html_providers
-        ['Imgur', 'Meetup', 'Gfycat']
+        ['Imgur', 'Meetup']
       end
 
       def self.html_providers
@@ -180,7 +180,7 @@ module Onebox
 
       # Generates the HTML for the embedded content
       def photo_type?
-        data[:type] =~ /photo/ || data[:type] =~ /image/
+        ( (data[:type] =~ /photo/ || data[:type] =~ /image/) && data[:type] !~ /photostream/ )
       end
 
       def article_type?

data/lib/onebox/version.rb

@@ -1,3 +1,3 @@
 module Onebox
-  VERSION = "1.5.14"
+  VERSION = "1.5.16"
 end

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

@@ -1,38 +1,52 @@
 require "spec_helper"
 
 describe Onebox::Engine::ClassicGoogleMapsOnebox do
-  describe 'long form url' do
-    before do
-      @link = "https://maps.google.ca/maps?q=Eiffel+Tower,+Avenue+Anatole+France,+Paris,+France&hl=en&sll=43.656878,-79.32085&sspn=0.932941,1.50238&oq=eiffel+&t=m&z=17&iwloc=A"
-    end
 
-    include_context "engines"
-    it_behaves_like "an engine"
+  URLS = {
+    short: "https://goo.gl/maps/rEG3D",
+    long: "https://www.google.de/maps/place/Statue+of+Liberty+National+Monument/@40.689249,-74.0445,17z/data=!3m1!4b1!4m2!3m1!1s0x89c25090129c363d:0x40c6a5770d25022b",
+    canonical: "https://maps.google.de/maps?sll=40.689249,-74.0445&sspn=0.0062479,0.0109864&cid=4667599994556318251&q=Statue+of+Liberty+National+Monument&output=classic&dg=ntvb",
+    embed: "https://maps.google.de/maps?sll=40.689249,-74.0445&sspn=0.0062479,0.0109864&cid=4667599994556318251&q=Statue+of+Liberty+National+Monument&output=embed&dg=ntvb&ll=40.689249,-74.0445&spn=0.0062479,0.0109864"
+  }
 
-    describe "#to_html" do
-      it "embeds the iframe to display the map" do
-        expect(html).to include("iframe")
-      end
-    end
+  before(:all) do
+    FakeWeb.register_uri(:head, URLS[:short], response: "HTTP/1.1 302 Found\nLocation: #{URLS[:long]}\n\n")
+    FakeWeb.register_uri(:head, URLS[:long], response: "HTTP/1.1 301 Moved Permanently\nLocation: #{URLS[:canonical]}\n\n")
   end
 
-  describe 'short form url' do
-    let(:long_url) { "https://maps.google.ca/maps?q=Brooklyn+Bridge,+Brooklyn,+NY,+United+States&hl=en&sll=43.656878,-79.32085&sspn=0.932941,1.50238&oq=brooklyn+bridge&t=m&z=17&iwloc=A" }
+  subject { described_class.new(link) }
 
-    it "retrieves the long form url" do
-      onebox = described_class.new("http://goo.gl/maps/XffUa")
-      onebox.expects(:get_long_url).once.returns(long_url)
-      expect(onebox.url).to eq(long_url)
-    end
+  it_behaves_like "an engine" do
+    let(:link) { URLS[:canonical] }
+    let(:data) { Onebox::Helpers.symbolize_keys(subject.send(:data)) }
   end
 
-  describe 'www form url' do
-    let(:embed_url) { "https://maps.google.de/maps?t=h&ll=48.398499,9.992333&spn=0.0038338,0.0056322&dg=ntvb&output=embed" }
+  shared_examples "embeddable" do |kind|
+    let(:link) { URLS[kind] }
+
+    it "resolves url correctly" do
+      subject.url.should == URLS[:embed]
+    end
+
+    it "produces an iframe" do
+      subject.to_html.should include("iframe", "output=embed")
+    end
 
-    it "retrieves the canonical url" do
-      onebox = described_class.new("https://www.google.de/maps/@48.3932366,9.992333,663a,20y,41.43t/data=!3m1!1e3")
-      onebox.expects(:get_canonical_url).once.returns(embed_url)
-      expect(onebox.url).to eq(embed_url)
+    it "produces a placeholder image" do
+      subject.placeholder_html.should include("img")
     end
   end
+
+  context "canonical url" do
+    it_should_behave_like "embeddable", :canonical
+  end
+
+  context "long url" do
+    it_should_behave_like "embeddable", :long
+  end
+
+  context "short url" do
+    it_should_behave_like "embeddable", :short
+  end
+
 end

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

@@ -0,0 +1,67 @@
+require "spec_helper"
+
+describe Onebox::Engine::GoogleDocsOnebox do
+  context "Spreadsheets" do
+    let(:matcher) { described_class.new("https://docs.google.com/spreadsheets/d/SHEET_KEY/pubhtml") }
+
+    it "should have spreadsheet class in html" do
+      expect(matcher.to_html).to include "spreadsheet-onebox"
+    end
+
+    it "should be a spreadsheet" do
+      expect(matcher.send(:spreadsheet?)).to be true
+    end
+
+    it "Should detect key" do
+      expect(matcher.send(:key)).to eq 'SHEET_KEY'
+    end
+  end
+
+  context "Documents" do
+    let(:matcher) { described_class.new("https://docs.google.com/document/d/DOC_KEY/pub") }
+
+    it "should have document class in html" do
+      expect(matcher.to_html).to include "document-onebox"
+    end
+
+    it "should be a document" do
+      expect(matcher.send(:document?)).to be true
+    end
+
+    it "Should detect key" do
+      expect(matcher.send(:key)).to eq 'DOC_KEY'
+    end
+  end
+
+  context "Presentaions" do
+    let(:matcher) { described_class.new("https://docs.google.com/presentation/d/PRESENTATION_KEY/pub") }
+
+    it "should have presentation class in html" do
+      expect(matcher.to_html).to include "presentation-onebox"
+    end
+
+    it "should be a presentation" do
+      expect(matcher.send(:presentation?)).to be true
+    end
+
+    it "Should detect key" do
+      expect(matcher.send(:key)).to eq 'PRESENTATION_KEY'
+    end
+  end
+
+  context "Forms" do
+    let(:matcher) { described_class.new("https://docs.google.com/forms/d/FORMS_KEY/viewform") }
+
+    it "should have forms class in html" do
+      expect(matcher.to_html).to include "forms-onebox"
+    end
+
+    it "should be a form" do
+      expect(matcher.send(:forms?)).to be true
+    end
+
+    it "Should detect key" do
+      expect(matcher.send(:key)).to eq 'FORMS_KEY'
+    end
+  end
+end

data/templates/githubblob.mustache

@@ -3,7 +3,7 @@
 <pre><code class='{{lang}}'>{{content}}</code></pre>
 {{/has_lines}}
 {{#has_lines}}
-{{! This is a template comment  | Sample rules for this box 
+{{! This is a template comment  | Sample rules for this box
 <style>
 pre.onebox code ol{
 	margin-left:0px;
@@ -34,4 +34,4 @@ pre.onebox code li.selected{
 
 {{#truncated}}
   This file has been truncated. <a href="{{link}}" target="_blank">show original</a>
-{{/truncated}}
+{{/truncated}}

data/templates/twitterstatus.mustache

@@ -5,7 +5,7 @@
   </a>
 </h4>
 
-{{{tweet}}}
+<p>{{{tweet}}}</p>
 
 <div class='date'>
   <a href="{{link}}" target="_blank">{{timestamp}}</a>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onebox
 version: !ruby/object:Gem::Version
-  version: 1.5.14
+  version: 1.5.16
 platform: ruby
 authors:
 - Joanna Zeta
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-12 00:00:00.000000000 Z
+date: 2015-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -295,6 +295,7 @@ files:
 - lib/onebox/engine/github_issue_onebox.rb
 - lib/onebox/engine/github_pullrequest_onebox.rb
 - lib/onebox/engine/google_calendar_onebox.rb
+- lib/onebox/engine/google_docs_onebox.rb
 - lib/onebox/engine/google_play_app_onebox.rb
 - lib/onebox/engine/html.rb
 - lib/onebox/engine/image_onebox.rb
@@ -348,6 +349,7 @@ files:
 - spec/lib/onebox/engine/github_commit_onebox_spec.rb
 - spec/lib/onebox/engine/github_gist_onebox_spec.rb
 - spec/lib/onebox/engine/github_pullrequest_onebox_spec.rb
+- spec/lib/onebox/engine/google_docs_onebox_spec.rb
 - spec/lib/onebox/engine/google_play_app_onebox_spec.rb
 - spec/lib/onebox/engine/html_spec.rb
 - spec/lib/onebox/engine/image_onebox_spec.rb
@@ -407,7 +409,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A gem for turning URLs into previews.
@@ -441,6 +443,7 @@ test_files:
 - spec/lib/onebox/engine/github_commit_onebox_spec.rb
 - spec/lib/onebox/engine/github_gist_onebox_spec.rb
 - spec/lib/onebox/engine/github_pullrequest_onebox_spec.rb
+- spec/lib/onebox/engine/google_docs_onebox_spec.rb
 - spec/lib/onebox/engine/google_play_app_onebox_spec.rb
 - spec/lib/onebox/engine/html_spec.rb
 - spec/lib/onebox/engine/image_onebox_spec.rb
@@ -460,4 +463,3 @@ test_files:
 - spec/lib/onebox_spec.rb
 - spec/spec_helper.rb
 - spec/support/html_spec_helper.rb
-has_rdoc: