onebox 1.5.12 → 1.5.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e46a3646e53f3419474f543aff459f7f2c4c4b75
-  data.tar.gz: baf10d809c943a1ef4ef4629ab45ba69a1379b9e
+  metadata.gz: 0f8031763d3695cefd269de23ffe5622d00223f1
+  data.tar.gz: 338f8b07c36852db96639a76a0a59d2cbbb1b1cf
 SHA512:
-  metadata.gz: ce73f343fecff549f1c155b7b614d34118e423326725e45f411eaf6d7107a4c72ab2f308efca65f128597339d5657fbac576438ab3ba4436afbf0516fb2b64ce
-  data.tar.gz: 936dc764425670e1eed82ec79c4f843e08d26b0062381d8692ec02825c2e18da40144c463ae8981dc367fc7f2325439fa8a6c0a607e9e270fba3962047291945
+  metadata.gz: c3d05b05258d6f3c828a5bd5b5993ead4034a4985b0df80150366d46b0e598dc2f6204d153e0538226e1e07a4fc619552e757de3273d1d8c6dfa56bc38a09766
+  data.tar.gz: d27d79ab2efe1ad279c61341d09e675b228dcc7e98ec6c1fce5dae4aec014858a1f0883c229758c40c1d9a2c69a376ac632bc9806c4783ca18532b5f2033217b

data/lib/onebox/engine/classic_google_maps_onebox.rb

@@ -4,23 +4,35 @@ module Onebox
       include Engine
       include LayoutSupport
 
-      matches_regexp /^(https?:)?\/\/(maps\.google\.[\w.]{2,}|goo\.gl)\/maps?.+$/
+      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_long_url if @url.include?("//goo.gl/maps/")
+        @url = get_canonical_url if @url.include?("www.google")
         @url
       end
 
       def to_html
-        "<iframe src='#{url}&output=embed' width='690px' height='400px' frameborder='0' style='border:0'></iframe>" 
+        "<iframe src='#{url}&output=embed' width='690px' height='400px' frameborder='0' style='border:0'></iframe>"
       end
 
-      private 
+      private
 
       def data
         {link: url, title: url}
       end
 
+      def get_canonical_url
+        uri = URI(@url)
+        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)

data/lib/onebox/engine/whitelisted_generic_onebox.rb

@@ -69,6 +69,7 @@ module Onebox
           kickstarter.com
           kinomap.com
           liveleak.com
+          livestream.com
           lessonplanet.com
           mashable.com
           meetup.com
@@ -150,7 +151,7 @@ module Onebox
       end
 
       def self.default_rewrites
-        %w(slideshare.net imgur.com dailymotion.com)
+        %w(slideshare.net imgur.com dailymotion.com livestream.com)
       end
 
       def self.host_matches(uri, list)

data/lib/onebox/version.rb

@@ -1,3 +1,3 @@
 module Onebox
-  VERSION = "1.5.12"
+  VERSION = "1.5.13"
 end

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

@@ -25,4 +25,14 @@ describe Onebox::Engine::ClassicGoogleMapsOnebox do
       expect(onebox.url).to eq(long_url)
     end
   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" }
+
+    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)
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onebox
 version: !ruby/object:Gem::Version
-  version: 1.5.12
+  version: 1.5.13
 platform: ruby
 authors:
 - Joanna Zeta
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-06 00:00:00.000000000 Z
+date: 2015-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -407,7 +407,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: A gem for turning URLs into previews.
@@ -460,3 +460,4 @@ test_files:
 - spec/lib/onebox_spec.rb
 - spec/spec_helper.rb
 - spec/support/html_spec_helper.rb
+has_rdoc: