onebox 1.8.17 → 1.8.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58d985b6655d6ee7f304e6421f986b9b209e70df
-  data.tar.gz: 9512550a24da0e89a59a96ad2ad6785441aaedf7
+  metadata.gz: 2e7e216d163d7adc99ee432d4bc16e639fa621f4
+  data.tar.gz: 9c9224c516ef324d858dfab29e37d68e80e0b23a
 SHA512:
-  metadata.gz: 2b633f0dd91a6c2aed8c400eb32b63750c8b2ae6a36ae1f8fb594ad8666768b530bc8b9b28b8e3c6dcb8a49c6c310af417b3d9a91649d0125a21d5d2a8237bb9
-  data.tar.gz: 8e18edd0c6269cb98a5ccacdfe7cc1cafcaa5d68ef27a5cae8ff9b79cfc5c7125b33d6a04336f32275c522260fb0c52941b5c342671aa7b38e788c40c12b6f1a
+  metadata.gz: 2501d3ae5025b97e8efb9133f6dedb91e21d7c0ee4d6775f8a0cc736798cc7109980f93b6dd70ebe6906713934674f071db7acf556e06054d9a0d9d5575fcd54
+  data.tar.gz: 07c2a809870856370d0062e34285ccfe14baa24e3c24eb83689b7884c9cd0accbf1239008930826ef077fbaeb769c8429f66cf17e060fccab4aabcd493ae7e21

data/lib/onebox/engine/pdf_onebox.rb

@@ -24,7 +24,10 @@ module Onebox
       def get_pdf_info
         uri = URI.parse(@url)
         size = Onebox::Helpers.fetch_content_length(@url)
-        return {filesize: Onebox::Helpers.pretty_filesize(size.to_i), name: File.basename(uri.path)}
+        return {
+          filesize: size ? Onebox::Helpers.pretty_filesize(size.to_i) : nil,
+          name: File.basename(uri.path)
+        }
       rescue
         nil
       end

data/lib/onebox/engine/standard_embed.rb

@@ -58,7 +58,8 @@ module Onebox
           response = (Onebox::Helpers.fetch_response(url, nil, nil, headers) rescue nil)
           doc = Nokogiri::HTML(response)
 
-          unless skip_canonical_link
+          ignore_canonical = doc.at('meta[property="og:ignore_canonical"]')
+          unless ignore_canonical && ignore_canonical['content'].to_s == 'true'
             # prefer canonical link
             canonical_link = doc.at('//link[@rel="canonical"]/@href')
             if canonical_link && "#{URI(canonical_link).host}#{URI(canonical_link).path}" != "#{URI(url).host}#{URI(url).path}"
@@ -124,10 +125,6 @@ module Onebox
 
           twitter
         end
-
-        def skip_canonical_link
-          WhitelistedGenericOnebox.probable_discourse(URI(url))
-        end
     end
   end
 end

data/lib/onebox/layout.rb

@@ -20,7 +20,7 @@ module Onebox
       end
 
       @md5 = Digest::MD5.new
-      @view = View.new(name, record)
+      @view = View.new(name, @record)
       @template_name = "_layout"
       @template_path = load_paths.last
     end

data/lib/onebox/version.rb

@@ -1,3 +1,3 @@
 module Onebox
-  VERSION = "1.8.17"
+  VERSION = "1.8.18"
 end

data/lib/onebox/web.rb

@@ -12,6 +12,8 @@ module Onebox
     set :public_folder, Proc.new { "#{root}/assets" }
     set :views, Proc.new { "#{root}/views" }
     configure :development do
+      register Sinatra::Reloader
+      also_reload 'lib/**/*.rb'
       enable :logging
     end
 

data/spec/fixtures/discourse_topic_reply.response

@@ -88,6 +88,7 @@ And that too in just over an year, way to go! [boom]">
 <meta name="twitter:title" content="Congratulations, most stars in 2013 GitHub Octoverse!" />
 <meta property="og:description" content="Ah, cool. I was not sure how to see that since GitHub changed around the way project top stats looked. Thanks for that link and thank you -- and everyone else who is contributing to the project!" />
 <meta name="twitter:description" content="Ah, cool. I was not sure how to see that since GitHub changed around the way project top stats looked. Thanks for that link and thank you -- and everyone else who is contributing to the project!" />
+<meta property="og:ignore_canonical" content="true" />
 
 
 

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

@@ -4,8 +4,12 @@ describe Onebox::Engine::PdfOnebox do
   let(:link) { "https://acrobatusers.com/assets/uploads/public_downloads/2217/adobe-acrobat-xi-merge-pdf-files-tutorial-ue.pdf" }
   let(:html) { described_class.new(link).to_html }
 
+  let(:no_content_length_link) { "https://dspace.lboro.ac.uk/dspace-jspui/bitstream/2134/14294/3/greiffenhagen-ca_and_consumption.pdf" }
+  let(:no_filesize_html) { described_class.new(no_content_length_link).to_html }
+
   before do
     FakeWeb.register_uri(:head, link, :content_length => "335562")
+    FakeWeb.register_uri(:head, no_content_length_link, :content_length => nil)
   end
 
   describe "#to_html" do
@@ -16,5 +20,9 @@ describe Onebox::Engine::PdfOnebox do
     it "includes filesize" do
       expect(html).to include("327.70 KB")
     end
+
+    it "doesn’t include filesize when unknown" do
+      expect(no_filesize_html).to_not include("<p class='filesize'>")
+    end
   end
 end

data/spec/lib/onebox/layout_spec.rb

@@ -69,5 +69,11 @@ describe Onebox::Layout do
       html = described_class.new("amazon", record, cache).to_html
       expect(html).to include(%|"foo"|)
     end
+
+    it "rewrites relative image path" do
+      record = { image: "/image.png", link: "https://discourse.org" }
+      klass = described_class.new("whitelistedgeneric", record, cache)
+      expect(klass.view.record[:image]).to include("https://discourse.org")
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onebox
 version: !ruby/object:Gem::Version
-  version: 1.8.17
+  version: 1.8.18
 platform: ruby
 authors:
 - Joanna Zeta
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-03 00:00:00.000000000 Z
+date: 2017-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -524,7 +524,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: A gem for turning URLs into previews.