onebox 1.8.85 → 1.8.86

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 292475b14d190bdb60b037b4a31cb613dd4e7380a68a3498082a78db162dd149
-  data.tar.gz: f6c171120798bea4d9d3151b50787dae070e0b9fdfc1861310fbd308cc48b76f
+  metadata.gz: 631c22d7ba52fd8d88052176bc42a74bfec14409ec65da82c9b8bf8eb64bae79
+  data.tar.gz: '09d424a57ca87f9dd5c3be877c9b8ad0bd3cf4101536d3bbcf158f9ef9fef7de'
 SHA512:
-  metadata.gz: e994b15b1b413515c7bcc5e5969e901bad6afd8165a9000727bb13afc395b4e4c74cdadc545ceddab55eea5bad7b7c80677906debbcdf8f706488271c8ce9771
-  data.tar.gz: aeaea261b44ff47529dcbf500f44b8a5324f356f51dd3691c39a5d37bf6fd0812b0f7a7a1a1e131a98e4416154101e5cc476ec5d792d1666e372d09a981696cb
+  metadata.gz: 65cd19cd9e45693343c0cc470f9511d53eb7c43829a56591f18df1bd72583847c29533074ccc366916a45545a7824849298e7ed3d4bb42031f76d431a1824c6e
+  data.tar.gz: 00f273d8ba17d3d4a5046bed67bccba703bd02d3f3ea96d727685fab1b4406dab017650872e8fdc329ffe6ad50f5d683884b37c7367200d5f7f29d387c5a6d1e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    onebox (1.8.85)
+    onebox (1.8.86)
       htmlentities (~> 4.3)
       moneta (~> 1.0)
       multi_json (~> 1.11)

data/lib/onebox/engine/github_blob_onebox.rb

@@ -15,7 +15,7 @@ module Onebox
         /github\.com\/(?<user>[^\/]+)\/(?<repo>[^\/]+)\/blob\/(?<sha1>[^\/]+)\/(?<file>[^#]+)(#(L(?<from>[^-]*)(-L(?<to>.*))?))?/mi
       end
       def raw_template(m)
-        "https://raw.github.com/#{m[:user]}/#{m[:repo]}/#{m[:sha1]}/#{m[:file]}"
+        "https://raw.githubusercontent.com/#{m[:user]}/#{m[:repo]}/#{m[:sha1]}/#{m[:file]}"
       end
       def title
         Sanitize.fragment(URI.unescape(link).sub(/^https?\:\/\/github\.com\//, ''))

data/lib/onebox/engine/vimeo_onebox.rb

@@ -7,13 +7,32 @@ module Onebox
       matches_regexp(/^https?:\/\/(www\.)?vimeo\.com\/\d+(\/[^\/]+)?$/)
       always_https
 
+      WIDTH  ||= 640
+      HEIGHT ||= 360
+
       def placeholder_html
-        oembed = get_oembed
-        "<img src='#{oembed.thumbnail_url}' width='#{oembed.thumbnail_width}' height='#{oembed.thumbnail_height}' #{oembed.title_attr}>"
+        image_src = og_data.image_secure_url || og_data.image_url
+        "<img src='#{image_src}' width='#{WIDTH}' height='#{HEIGHT}' #{og_data.title_attr}>"
       end
 
       def to_html
-        get_oembed.html
+        video_src = og_data.video_secure_url || og_data.video_url
+        video_src = video_src.gsub('autoplay=1', '').chomp("?")
+        <<-HTML
+          <iframe width="#{WIDTH}"
+                  height="#{HEIGHT}"
+                  src="#{video_src}"
+                  data-original-href="#{link}"
+                  frameborder="0"
+                  allowfullscreen>
+          </iframe>
+        HTML
+      end
+
+      private
+
+      def og_data
+        @og_data = get_opengraph
       end
     end
   end

data/lib/onebox/engine/whitelisted_generic_onebox.rb

@@ -336,15 +336,17 @@ module Onebox
       end
 
       def video_html
-        escaped_src = ::Onebox::Helpers.normalize_url_for_output(data[:video])
+        escaped_video_src = ::Onebox::Helpers.normalize_url_for_output(data[:video])
+        escaped_image_src = ::Onebox::Helpers.normalize_url_for_output(data[:image])
 
         <<-HTML
             <video title='#{data[:title]}'
                    width='#{data[:video_width]}'
                    height='#{data[:video_height]}'
                    style='max-width:100%'
+                   poster='#{escaped_image_src}'
                    controls=''>
-              <source src='#{escaped_src}'>
+              <source src='#{escaped_video_src}'>
             </video>
           HTML
       end

data/lib/onebox/mixins/git_blob_onebox.rb

@@ -158,38 +158,46 @@ module Onebox
 
             @file = m[:file]
             @lang = Onebox::FileTypeFinder.from_file_name(m[:file])
-            contents = open(self.raw_template(m), read_timeout: timeout).read
-
-            contents_lines = contents.lines           #get contents lines
-            contents_lines_size = contents_lines.size #get number of lines
-
-            cr = calc_range(m, contents_lines_size)    #calculate the range of lines for output
-            selected_one_liner = cr[:selected_one_liner] #if url is a one-liner calc_range will return it
-            from           = cr[:from]
-            to             = cr[:to]
-            @truncated     = cr[:truncated]
-            range_provided = cr[:range_provided]
-            @cr_results = cr
-
-            if range_provided       #if a range provided (single line or more)
-              if SHOW_LINE_NUMBER
-                lines_result = line_number_helper(contents_lines[(from - 1)..(to - 1)], from, selected_one_liner)  #print code with prefix line numbers in case range provided
-                contents = lines_result[:output]
-                @selected_lines_array = lines_result[:array]
+
+            if @lang == "stl" && link.match(/^https?:\/\/(www\.)?github\.com.*\/blob\//)
+
+              @model_file = @lang.dup
+              @raw = "https://render.githubusercontent.com/view/solid?url=" + self.raw_template(m)
+
+            else
+              contents = open(self.raw_template(m), read_timeout: timeout).read
+
+              contents_lines = contents.lines           #get contents lines
+              contents_lines_size = contents_lines.size #get number of lines
+
+              cr = calc_range(m, contents_lines_size)    #calculate the range of lines for output
+              selected_one_liner = cr[:selected_one_liner] #if url is a one-liner calc_range will return it
+              from           = cr[:from]
+              to             = cr[:to]
+              @truncated     = cr[:truncated]
+              range_provided = cr[:range_provided]
+              @cr_results = cr
+
+              if range_provided       #if a range provided (single line or more)
+                if SHOW_LINE_NUMBER
+                  lines_result = line_number_helper(contents_lines[(from - 1)..(to - 1)], from, selected_one_liner)  #print code with prefix line numbers in case range provided
+                  contents = lines_result[:output]
+                  @selected_lines_array = lines_result[:array]
+                else
+                  contents = contents_lines[(from - 1)..(to - 1)].join()
+                end
+
               else
                 contents = contents_lines[(from - 1)..(to - 1)].join()
               end
 
-            else
-              contents = contents_lines[(from - 1)..(to - 1)].join()
-            end
+              if contents.length > MAX_CHARS    #truncate content chars to limits
+                contents = contents[0..MAX_CHARS]
+                @truncated = true
+              end
 
-            if contents.length > MAX_CHARS    #truncate content chars to limits
-              contents = contents[0..MAX_CHARS]
-              @truncated = true
+              @raw = contents
             end
-
-            @raw = contents
           end
         end
 
@@ -206,7 +214,10 @@ module Onebox
             has_lines: !@selected_lines_array.nil?,
             selected_one_liner: @selected_one_liner,
             cr_results: @cr_results,
-            truncated: @truncated
+            truncated: @truncated,
+            model_file: @model_file,
+            width: 480,
+            height: 360
           }
         end
       end

data/lib/onebox/sanitize_config.rb

@@ -10,7 +10,7 @@ class Sanitize
         'a' => RELAXED[:attributes]['a'] + %w(target),
         'audio' => %w[controls],
         'embed' => %w[height src type width],
-        'iframe' => %w[allowfullscreen frameborder height scrolling src width],
+        'iframe' => %w[allowfullscreen frameborder height scrolling src width data-original-href],
         'source' => %w[src type],
         'video' => %w[controls height loop width autoplay muted poster],
         'path' => %w[d],

data/lib/onebox/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Onebox
-  VERSION = "1.8.85"
+  VERSION = "1.8.86"
 end

data/templates/githubblob.mustache

@@ -1,6 +1,13 @@
 <h4><a href="{{link}}" target="_blank">{{title}}</a></h4>
 {{^has_lines}}
+{{#model_file}}
+<iframe class="render-viewer" width="{{width}}" height="{{height}}" src="{{content}}" sandbox="allow-scripts allow-same-origin allow-top-navigation ">
+Viewer requires iframe.
+</iframe>
+{{/model_file}}
+{{^model_file}}
 <pre><code class='{{lang}}'>{{content}}</code></pre>
+{{/model_file}}
 {{/has_lines}}
 {{#has_lines}}
 {{! This is a template comment  | Sample rules for this box

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onebox
 version: !ruby/object:Gem::Version
-  version: 1.8.85
+  version: 1.8.86
 platform: ruby
 authors:
 - Joanna Zeta
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-12 00:00:00.000000000 Z
+date: 2019-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json